diff --git a/Source/Game/Entities/Creature/Creature.cs b/Source/Game/Entities/Creature/Creature.cs
index 6c267dc2f..562f47365 100644
--- a/Source/Game/Entities/Creature/Creature.cs
+++ b/Source/Game/Entities/Creature/Creature.cs
@@ -746,13 +746,10 @@ namespace Game.Entities
                 return false;
             }
 
-            if (ai == null)
-                ai = AISelector.SelectAI(this);
-
-            SetAI(ai);
-
             InitializeMovementAI();
 
+            SetAI(ai != null ? ai : AISelector.SelectAI(this));
+
             i_AI.InitializeAI();
 
             // Initialize vehicle