diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 241089e34..43fb20a08 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -12020,7 +12020,10 @@ void Unit::CleanupsBeforeDelete()
         CombatStop();
         ClearComboPointHolders();
         DeleteThreatList();
-        getHostileRefManager().setOnlineOfflineState(false);
+        if (GetTypeId()==TYPEID_PLAYER)
+            getHostileRefManager().setOnlineOfflineState(false);
+        else
+            getHostileRefManager().deleteReferences();
         RemoveAllAuras(AURA_REMOVE_BY_DELETE);
         GetMotionMaster()->Clear(false);                    // remove different non-standard movement generators.
     }
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index bdabb2268..86fdf9e2f 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "9980"
+ #define REVISION_NR "9981"
 #endif // __REVISION_NR_H__