diff --git a/src/server/game/Entities/Housing/HousingRoomEntity.cpp b/src/server/game/Entities/Housing/HousingRoomEntity.cpp
index 33762b10e..fa68aa5e8 100644
--- a/src/server/game/Entities/Housing/HousingRoomEntity.cpp
+++ b/src/server/game/Entities/Housing/HousingRoomEntity.cpp
@@ -51,12 +51,14 @@ std::string HousingRoomEntity::GetNameForLocaleIdx(LocaleConstant /*locale*/) co
 void HousingRoomEntity::BuildUpdate(UpdateDataMapType& data_map)
 {
     BuildUpdateChangesMask();
-
     // Send to all players on this map
     Map::PlayerList const& players = _map->GetPlayers();
-    for (auto const& [_, player] : players)
-        BuildFieldsUpdate(player, data_map);
-
+    for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
+    {
+        Player* player = itr->GetSource();
+        if (player)
+            BuildFieldsUpdate(player, data_map);
+    }
     ClearUpdateMask(false);
 }