diff --git a/domain/modelling/generators/heating_recommendation.py b/domain/modelling/generators/heating_recommendation.py
index 9eae0353e..3ba716d6a 100644
--- a/domain/modelling/generators/heating_recommendation.py
+++ b/domain/modelling/generators/heating_recommendation.py
@@ -722,6 +722,6 @@ def _hhr_storage_eligible(epc: EpcPropertyData) -> bool:
         return False
     if main.main_heating_category == _HEAT_PUMP_CATEGORY:
         return False
-    off_gas: bool = not epc.sap_energy_source.mains_gas
+    off_gas: bool = main.main_fuel_type not in _GAS_FUEL_CODES
     electric_main: bool = main.main_fuel_type == _ELECTRICITY_FUEL
     return electric_main or off_gas