diff --git a/datatypes/magicplan/domain/mapper.py b/datatypes/magicplan/domain/mapper.py
index f00c6780..fc525d5c 100644
--- a/datatypes/magicplan/domain/mapper.py
+++ b/datatypes/magicplan/domain/mapper.py
@@ -16,11 +16,7 @@ def map_plan(mp: MagicPlan) -> Plan:
 def _map_address(addr: api.Address | None) -> str | None:
     if addr is None:
         return None
-    street = (
-        f"{addr.street_number} {addr.street}".strip()
-        if addr.street_number
-        else addr.street
-    )
+    street = " ".join(p for p in [addr.street_number, addr.street] if p) or None
     parts = [p for p in [street, addr.city, addr.country] if p]
     return ", ".join(parts) if parts else None