diff --git a/etl/find_my_epc/AssetListEpcData.py b/etl/find_my_epc/AssetListEpcData.py
index ba490161..7bd16090 100644
--- a/etl/find_my_epc/AssetListEpcData.py
+++ b/etl/find_my_epc/AssetListEpcData.py
@@ -45,7 +45,9 @@ class AssetListEpcData:
 
         self.non_invasive_recommendations = [
             {
-                "uprn": r["uprn"],
+                "uprn": r.get("uprn"),
+                "address": r["address"],
+                "postcode": r["postcode"],
                 "recommendations": r["recommendations"]
             } for r in self.extracted_data
         ]
@@ -63,7 +65,7 @@ class AssetListEpcData:
             epc_searcher = SearchEpc(
                 address1=add1,
                 postcode=pc,
-                uprn=home["uprn"],
+                uprn=home.get("uprn"),
                 auth_token=self.epc_auth_token,
                 os_api_key=""
             )
@@ -81,7 +83,9 @@ class AssetListEpcData:
 
             extracted_data.append(
                 {
-                    "uprn": home["uprn"],
+                    "uprn": home.get("uprn"),
+                    "address": home["address"],
+                    "postcode": home["postcode"],
                     **find_epc_data,
                 }
             )