diff --git a/datatypes/magicplan/domain/mapper.py b/datatypes/magicplan/domain/mapper.py
index 71cb91c2..5f605b30 100644
--- a/datatypes/magicplan/domain/mapper.py
+++ b/datatypes/magicplan/domain/mapper.py
@@ -47,9 +47,15 @@ def _map_room(r: api.Room) -> Room:
         length_m=length,
         area_m2=round(r.area, 2),
         windows=[
-            _map_window(wi) for wi in r.wall_items if wi.symbol.id.startswith("window")
+            _map_window(wi)
+            for wi in r.wall_items
+            if wi.symbol.id.startswith("window") or wi.symbol.id == "doorglass"
+        ],
+        doors=[
+            _map_door(wi)
+            for wi in r.wall_items
+            if wi.symbol.id.startswith("door") and wi.symbol.id != "doorglass"
         ],
-        doors=[_map_door(wi) for wi in r.wall_items if wi.symbol.id.startswith("door")],
     )