diff --git a/src/environment.cpp b/src/environment.cpp
index ee37678cb..dc0f5e879 100644
--- a/src/environment.cpp
+++ b/src/environment.cpp
@@ -2114,7 +2114,8 @@ void ClientEnvironment::step(float dtime)
 
 	f32 dtime_downcount = dtime;
 
-	free_move |= lplayer->in_liquid || lplayer->in_liquid_stable;
+	free_move |= (lplayer->in_liquid || lplayer->in_liquid_stable)
+					&& (fabs(lplayer->getSpeed().X) > .001 && fabs(lplayer->getSpeed().Y > 0.001));
 
 	/*
 		Stuff that has a maximum time increment