diff --git a/src/game/GridNotifiers.cpp b/src/game/GridNotifiers.cpp
index e9e1449fa25..5617fe19358 100644
--- a/src/game/GridNotifiers.cpp
+++ b/src/game/GridNotifiers.cpp
@@ -115,7 +115,7 @@ VisibleChangesNotifier::Visit(DynamicObjectMapType &m)
 
 inline void CreatureUnitRelocationWorker(Creature* c, Unit* u)
 {
-    if(!u->isAlive() || !c->isAlive() || u->isInFlight())
+    if(!u->isAlive() || !c->isAlive() || c == u || u->isInFlight())
         return;
 
     if(c->HasReactState(REACT_AGGRESSIVE) && !c->hasUnitState(UNIT_STAT_SIGHTLESS))