diff --git a/Source/Game/AI/CoreAI/CreatureAI.cs b/Source/Game/AI/CoreAI/CreatureAI.cs
index 60c17d351..b8946fbcd 100644
--- a/Source/Game/AI/CoreAI/CreatureAI.cs
+++ b/Source/Game/AI/CoreAI/CreatureAI.cs
@@ -175,9 +175,6 @@ namespace Game.AI
             }
 
             Reset();
-
-            if (me.IsVehicle()) // use the same sequence of addtoworld, aireset may remove all summons!
-                me.GetVehicleKit().Reset(true);
         }
 
         public bool UpdateVictim()
diff --git a/Source/Game/Movement/Generators/HomeMovement.cs b/Source/Game/Movement/Generators/HomeMovement.cs
index fcddf18ca..39725b443 100644
--- a/Source/Game/Movement/Generators/HomeMovement.cs
+++ b/Source/Game/Movement/Generators/HomeMovement.cs
@@ -75,6 +75,8 @@ namespace Game.AI
                 owner.SetWalk(true);
                 owner.SetSpawnHealth();
                 owner.LoadCreaturesAddon();
+                if (owner.IsVehicle())
+                    owner.GetVehicleKit().Reset(true);
                 owner.GetAI().JustReachedHome();
             }
         }