diff --git a/src/hack.c b/src/hack.c
index 960db56a4..06a99cf88 100644
--- a/src/hack.c
+++ b/src/hack.c
@@ -1,4 +1,4 @@
-/* NetHack 3.6	hack.c	$NHDT-Date: 1578849526 2020/01/12 17:18:46 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.242 $ */
+/* NetHack 3.6	hack.c	$NHDT-Date: 1578916008 2020/01/13 11:46:48 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.243 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /*-Copyright (c) Derek S. Ray, 2015. */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -340,7 +340,8 @@ moverock()
                                     slot or into the overflow ('#') slot
                                     unless already carrying at least one */
                               && (inv_cnt(FALSE) < 52 || !carrying(BOULDER))),
-                    willpickup = (canpickup && flags.pickup
+                    willpickup = (canpickup
+                                  && (flags.pickup && !g.context.nopick)
                                   && autopick_testobj(otmp, TRUE));
 
                 if (u.usteed && P_SKILL(P_RIDING) < P_BASIC) {