diff --git a/common/game/playercontrol.cpp b/common/game/playercontrol.cpp
index 8d48c583f..5c4f92f82 100644
--- a/common/game/playercontrol.cpp
+++ b/common/game/playercontrol.cpp
@@ -858,21 +858,22 @@ void PlayerControl::implMove(uint64_t dt) {
     ani = Npc::Anim::MoveR;
     }
   else if(this->wantsToMoveForward()) {
-    if((pl.walkMode()&WalkBit::WM_Dive)!=WalkBit::WM_Dive) {
-      ani = Npc::Anim::Move;
-      }
-    else if(pl.isDive()) {
+    if(pl.isDive()) {
       pl.setDirectionY(rotY - rspeed);
       return;
       }
+    else {
+      ani = Npc::Anim::Move;
+      }
     }
   else if(this->wantsToMoveBackward()) {
-    if((pl.walkMode()&WalkBit::WM_Dive)!=WalkBit::WM_Dive) {
-      ani = Npc::Anim::MoveBack;
-      } else if(pl.isDive()) {
+    if(pl.isDive()) {
       pl.setDirectionY(rotY + rspeed);
       return;
       }
+    else {
+      ani = Npc::Anim::MoveBack;
+      }
     }