diff --git a/src/client/houses.cpp b/src/client/houses.cpp
index ea5c88ab..36d22a3c 100644
--- a/src/client/houses.cpp
+++ b/src/client/houses.cpp
@@ -41,6 +41,7 @@ House::House(uint32 hId, const std::string &name, const Position &pos)
 void House::setTile(const TilePtr& tile)
 {
     tile->setFlag(TILESTATE_HOUSE);
+    tile->setHouseId(getId());
     m_tiles.insert(std::make_pair(tile->getPosition(), tile));
 }
 
diff --git a/src/client/mapio.cpp b/src/client/mapio.cpp
index 2e57f9fb..690a097e 100644
--- a/src/client/mapio.cpp
+++ b/src/client/mapio.cpp
@@ -179,8 +179,8 @@ void Map::loadOtbm(const std::string& fileName)
                     }
 
                     if(const TilePtr& tile = getTile(pos)) {
-                        if(house)
-                            tile->setHouseId(house->getId());
+                        if(tile->hasFlag(TILESTATE_HOUSE))
+                            tile->setFlags(tile->getFlags() & ~TILESTATE_HOUSE);
                         tile->setFlags((tileflags_t)flags);
                     }
                 }