diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index 3872d40..a692afe 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -662,9 +662,11 @@ void Room::RemoveObjectLater(RoomEntity* entity)
                 break;
             case ET_Hero:
                 {
-                    entity->RemoveFromAroundPlayers(entity->room);
+                    #if 0
                     entity->BroadcastDeleteState(entity->room);
+                    entity->RemoveFromAroundPlayers(entity->room);
                     entity->room->grid_service->RemoveCreature((Hero*)entity);
+                    #endif
                     entity->room->RemoveFromMoveableHash((Hero*)entity);
                 }
                 break;