diff --git a/Source/Game/Entities/DynamicObject.cs b/Source/Game/Entities/DynamicObject.cs
index 86b26039a..06e0d5498 100644
--- a/Source/Game/Entities/DynamicObject.cs
+++ b/Source/Game/Entities/DynamicObject.cs
@@ -163,10 +163,7 @@ namespace Game.Entities
         public void Remove()
         {
             if (IsInWorld)
-            {
-                RemoveFromWorld();
                 AddObjectToRemoveList();
-            }
         }
 
         int GetDuration()
diff --git a/Source/Game/Entities/Object/Update/UpdateData.cs b/Source/Game/Entities/Object/Update/UpdateData.cs
index 4d70faf2e..5051fb585 100644
--- a/Source/Game/Entities/Object/Update/UpdateData.cs
+++ b/Source/Game/Entities/Object/Update/UpdateData.cs
@@ -93,7 +93,7 @@ namespace Game.Entities
             MapId = 0;
         }
 
-        public bool HasData() { return BlockCount > 0 || outOfRangeGUIDs.Count != 0; }
+        public bool HasData() { return BlockCount > 0 || !outOfRangeGUIDs.Empty() || !destroyGUIDs.Empty(); }
 
         public List<ObjectGuid> GetOutOfRangeGUIDs() { return outOfRangeGUIDs; }