diff --git a/lib/cli/map.js b/lib/cli/map.js
index 6f6a129..cdaeb28 100644
--- a/lib/cli/map.js
+++ b/lib/cli/map.js
@@ -555,7 +555,7 @@ exports.generateRoom = utils.withHelp([
 
                 return q.all([
                     db.rooms.insert({_id: roomName, status: 'normal', sourceKeepers}),
-                    db['rooms.terrain'].insert({room: roomName, terrain}),
+                    db['rooms.terrain'].insert({room: roomName, terrain, type: "terrain"}),
                     objects.length ? db['rooms.objects'].insert(objects) : q.when()
                 ]);
             })
diff --git a/lib/game/api/game.js b/lib/game/api/game.js
index eaeb643..8170be9 100644
--- a/lib/game/api/game.js
+++ b/lib/game/api/game.js
@@ -270,7 +270,7 @@ router.get('/room-terrain', jsonResponse((request) => {
         if(request.query.encoded) {
             return {terrain};
         }
-        if(terrain.length == 1 && terrain[0].type == 'terrain') {
+        if(terrain.length == 1 && typeof terrain[0].terrain === 'string') {
             return {terrain: common.decodeTerrain(terrain[0].terrain, request.query.room)};
         }
         return {terrain};