diff --git a/src/app/db/schema/property.ts b/src/app/db/schema/property.ts
index 3d295e17..c7d8dd1a 100644
--- a/src/app/db/schema/property.ts
+++ b/src/app/db/schema/property.ts
@@ -435,10 +435,10 @@ export const epcProperty = pgTable(
     calculationSoftwareVersion: text("calculation_software_version"),
 
     // Address
-    addressLine1: text("address_line_1"),
+    addressLine1: text("address_line_1").notNull(),
     addressLine2: text("address_line_2"),
-    postTown:     text("post_town"),
-    postcode:     text("postcode"),
+    postTown:     text("post_town").notNull(),
+    postcode:     text("postcode").notNull(),
     regionCode:   text("region_code"),
     countryCode:  text("country_code"),
     languageCode: text("language_code"),