diff --git a/domain/epc/property_overlays/main_heating_system_overlay.py b/domain/epc/property_overlays/main_heating_system_overlay.py
index 466466594..2e046dd90 100644
--- a/domain/epc/property_overlays/main_heating_system_overlay.py
+++ b/domain/epc/property_overlays/main_heating_system_overlay.py
@@ -280,7 +280,7 @@ def _category_for(code: int) -> Optional[int]:
     category 7); without it a storage override left a stale category behind,
     which the SAP 10.2 Table 12a resolver (keyed on category) could misread as a
     non-storage system and price the off-peak storage heating at the peak rate."""
-    if code in _CATEGORY_10_ROOM_HEATER_CODES:
+    if code in _CATEGORY_10_ROOM_HEATER_CODES or code in _ELECTRIC_ROOM_HEATER_CODES:
         return _ROOM_HEATER_CATEGORY
     if code in _STORAGE_HEATER_CODES:
         return _STORAGE_HEATER_CATEGORY