1 files changed, 3 insertions, 0 deletions
diff --git a/src/game/Object.h b/src/game/Object.h
index 1a7a70163ca..7e18ea4db92 100644
--- a/src/game/Object.h
+++ b/src/game/Object.h
@@ -130,6 +130,9 @@ class TRINITY_DLL_SPEC Object
         }
         virtual void RemoveFromWorld()
         {
+            if(!m_inWorld)
+                return;
+
             // if we remove from world then sending changes not required
             if(m_uint32Values)
                 ClearUpdateMask(true);