diff --git a/hub/catalog_factories/energy_systems/north_america_energy_system_catalog.py b/hub/catalog_factories/energy_systems/north_america_energy_system_catalog.py
index f6b37cff..e3a54197 100644
--- a/hub/catalog_factories/energy_systems/north_america_energy_system_catalog.py
+++ b/hub/catalog_factories/energy_systems/north_america_energy_system_catalog.py
@@ -194,6 +194,24 @@ class NorthAmericaEnergySystemCatalog(Catalog):
       storage_components.append(storage_component)
     return storage_components
 
+  def _load_systems(self):
+    systems = []
+    catalog_systems = self._archetypes['encomp:EnergySystemCatalog']['energysystemconfiguration']
+    for catalog_system in catalog_systems:
+      system_configuration = catalog_system['@configurationName']
+      energy_system = System(None,
+                             None,
+                             system_configuration,
+                             None,
+                             None,
+                             None,
+                             None,
+                             None,
+                             None,
+                             None)
+      systems.append(energy_system)
+    return systems
+
   def _load_materials(self):
     materials = []
     _materials = self._archetypes['encomp:EnergySystemCatalog']['energycomponent']['materials']
diff --git a/hub/data/energy_systems/Tools4CitiesESMF.xml b/hub/data/energy_systems/Tools4CitiesESMF.xml
index f7e45e35..ef96db92 100644
--- a/hub/data/energy_systems/Tools4CitiesESMF.xml
+++ b/hub/data/energy_systems/Tools4CitiesESMF.xml
@@ -50,7 +50,7 @@
     <demands name="domesticHotWater"/>
   </energysystemconfiguration>
   <energysystemconfiguration configurationName="hpTesBoiler"/>
-  <energysystemconfiguration/>
+  <energysystemconfiguration configurationName="hpTes"/>
   <energydemand name="heating"/>
   <energydemand name="domesticHotWater"/>
   <energydemand name="electricity"/>