diff --git a/data/fields/memorial/addr.json b/data/fields/memorial/addr.json
index 2b432cee..469dff76 100644
--- a/data/fields/memorial/addr.json
+++ b/data/fields/memorial/addr.json
@@ -1,5 +1,8 @@
 {
     "type": "text",
     "key": "memorial:addr",
-    "label": "Nearest Building Address"
+    "label": "Nearest Building Address",
+    "prerequisiteTag": {
+        "keyNot": "memorial:addr:housenumber"
+    }
 }
diff --git a/data/fields/memorial/addr_subtags.json b/data/fields/memorial/addr_subtags.json
new file mode 100644
index 00000000..b9439777
--- /dev/null
+++ b/data/fields/memorial/addr_subtags.json
@@ -0,0 +1,16 @@
+{
+    "type": "address",
+    "key": "memorial:addr",
+    "keys": [
+        "memorial:addr:city",
+        "memorial:addr:housename",
+        "memorial:addr:housenumber",
+        "memorial:addr:place",
+        "memorial:addr:postcode",
+        "memorial:addr:street"
+    ],
+    "label": "{memorial/addr}",
+    "prerequisiteTag": {
+        "key": "memorial:addr:housenumber"
+    }
+}
diff --git a/data/presets/historic/memorial/stolperstein-EU.json b/data/presets/historic/memorial/stolperstein-EU.json
index b0bd468e..4de1e172 100644
--- a/data/presets/historic/memorial/stolperstein-EU.json
+++ b/data/presets/historic/memorial/stolperstein-EU.json
@@ -7,6 +7,7 @@
     ],
     "moreFields": [
         "memorial/addr",
+        "memorial/addr_subtags",
         "subject/wikidata",
         "image",
         "wikimedia_commons",