diff --git a/src/otclient/core/game.cpp b/src/otclient/core/game.cpp
index 9d1d3c7e..ee890d96 100644
--- a/src/otclient/core/game.cpp
+++ b/src/otclient/core/game.cpp
@@ -148,6 +148,9 @@ void Game::processCreatureTeleport(const CreaturePtr& creature)
 {
     // stop walking on creature teleports
     creature->stopWalk();
+
+    if(creature == m_localPlayer)
+        m_localPlayer->lockWalk();
 }
 
 void Game::processAttackCancel()