diff --git a/datatypes/epc/domain/mapper.py b/datatypes/epc/domain/mapper.py
index 75736ea2..4379f8b3 100644
--- a/datatypes/epc/domain/mapper.py
+++ b/datatypes/epc/domain/mapper.py
@@ -2189,7 +2189,7 @@ class EpcPropertyDataMapper:
             mechanical_vent_duct_type=schema.mechanical_vent_duct_type,
             # Lighting
             led_fixed_lighting_bulbs_count=schema.led_fixed_lighting_bulbs_count,
-            cfl_fixed_lighting_bulbs_count=schema.cfl_fixed_lighting_bulbs_count,
+            cfl_fixed_lighting_bulbs_count=schema.cfl_fixed_lighting_bulbs_count or 0,
             incandescent_fixed_lighting_bulbs_count=schema.incandescent_fixed_lighting_bulbs_count,
             # Energy elements
             roofs=EpcPropertyDataMapper._map_energy_elements(schema.roofs),