diff --git a/server/gameserver/movement.cc b/server/gameserver/movement.cc
index f379971c..fd189e48 100644
--- a/server/gameserver/movement.cc
+++ b/server/gameserver/movement.cc
@@ -42,10 +42,18 @@ bool Movement::UpdatePosition()
             next_point.dir.z = dir.z;
         }
     }
+    if (owner_->GetPos().GetX() < 0) {
+        owner_->GetMutablePos().SetX(0);
+    }
+    if (owner_->GetPos().GetZ() < 0) {
+        owner_->GetMutablePos().SetZ(0);
+    }
+    #if 0
     if (owner_->GetPos().GetX() < 0 ||
         owner_->GetPos().GetZ() < 0) {
         abort();
     }
+    #endif
     return true;
 }