diff --git a/Source/Game/Entities/Creature/Creature.cs b/Source/Game/Entities/Creature/Creature.cs
index e34dfbf5a..0db83331d 100644
--- a/Source/Game/Entities/Creature/Creature.cs
+++ b/Source/Game/Entities/Creature/Creature.cs
@@ -383,7 +383,7 @@ namespace Game.Entities
             {
                 triggerJustAppeared = false;
                 GetAI().JustAppeared();
-                if (VehicleKit != null)
+                if (m_respawnCompatibilityMode && VehicleKit != null)
                     VehicleKit.Reset();
             }
 
@@ -1480,8 +1480,8 @@ namespace Game.Entities
             DB.World.CommitTransaction(trans);
 
             // then delete any active instances of the creature
-            var range = GetMap().GetCreatureBySpawnIdStore().LookupByKey(m_spawnId);
-            foreach (var creature in range)
+            var spawnMap = GetMap().GetCreatureBySpawnIdStore().LookupByKey(m_spawnId);
+            foreach (var creature in spawnMap)
                 creature.AddObjectToRemoveList();
         }