diff --git a/src/client/mapio.cpp b/src/client/mapio.cpp
index 121df0c9..5da46593 100644
--- a/src/client/mapio.cpp
+++ b/src/client/mapio.cpp
@@ -273,8 +273,8 @@ void Map::saveOtbm(const std::string& fileName)
             root->addU32(version);
 
             Size mapSize = getSize();
-            root->addU16(65535);
-            root->addU16(65535);
+            root->addU16(mapSize.width());
+            root->addU16(mapSize.height());
 
             root->addU32(g_things.getOtbMajorVersion());
             root->addU32(g_things.getOtbMinorVersion());