diff --git a/src/shared/pmove.c b/src/shared/pmove.c
index 9a13a8bc..3425d2e7 100644
--- a/src/shared/pmove.c
+++ b/src/shared/pmove.c
@@ -733,6 +733,7 @@ PMove_Run(void)
 
 	if (pl.flags & FL_FROZEN) {
 		input_movevalues = [0,0,0];
+		input_buttons &= ~INPUT_BUTTON2;
 	}
 
 	/* establish which water elements we're dealing in */