diff --git a/backend/app/modelling/property_filters.py b/backend/app/modelling/property_filters.py
index 530a909cb..8a1428867 100644
--- a/backend/app/modelling/property_filters.py
+++ b/backend/app/modelling/property_filters.py
@@ -107,8 +107,8 @@ def _resolved_property_types(
     ).all()
     by_epc_source: dict[str, dict[int, str]] = {"lodged": {}, "predicted": {}}
     for epc in epcs:
-        if epc.property_id is not None and epc.property_type is not None:
-            value = epc.property_type
+        value = epc.property_type or epc.dwelling_type
+        if epc.property_id is not None and value:
             by_epc_source[epc.source][epc.property_id] = _PROPERTY_TYPE_CODES.get(
                 value, value
             )