diff --git a/src/server/game/AI/CreatureAI.h b/src/server/game/AI/CreatureAI.h
index ccf7170a0..55c65b16f 100644
--- a/src/server/game/AI/CreatureAI.h
+++ b/src/server/game/AI/CreatureAI.h
@@ -133,7 +133,7 @@ public:
     virtual void MovementInform(uint32 /*type*/, uint32 /*id*/) {}
 
     // Called at MovePath End
-    virtual void PathEndReached() {}
+    virtual void PathEndReached(uint32 /*pathId*/) {}
 
     void OnCharmed(bool apply) override;
 
diff --git a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
index 5ce84b348..111e8d329 100644
--- a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
@@ -137,8 +137,8 @@ bool WaypointMovementGenerator<Creature>::StartMove(Creature* creature)
         // Xinef: moved the upper IF here
         if ((i_currentNode == i_path->size() - 1) && !repeating) // If that's our last waypoint
         {
+            creature->AI()->PathEndReached(path_id);
             creature->GetMotionMaster()->Initialize();
-            creature->AI()->PathEndReached();
             return false;
         }