diff --git a/desktop_version/src/Entity.cpp b/desktop_version/src/Entity.cpp
index f02e3584..7b97d0f3 100644
--- a/desktop_version/src/Entity.cpp
+++ b/desktop_version/src/Entity.cpp
@@ -1983,6 +1983,8 @@ void entityclass::createentity( float xp, float yp, int t, float vx /*= 0*/, flo
         if (map.custommode)
         {
             customwarpmode = true;
+            map.warpx = false;
+            map.warpy = false;
         }
         break;
       case 55: // Crew Member (custom, collectable)