diff --git a/src/Plugin/os2web/DataLookup/DatafordelerPNumber.php b/src/Plugin/os2web/DataLookup/DatafordelerPNumber.php
index efecd5d..32eed44 100644
--- a/src/Plugin/os2web/DataLookup/DatafordelerPNumber.php
+++ b/src/Plugin/os2web/DataLookup/DatafordelerPNumber.php
@@ -94,7 +94,10 @@ public function lookup(string $param): CompanyLookupResult {
         $cvrResult->setFloor($address->CVRAdresse_etagebetegnelse ?? '');
         $cvrResult->setApartmentNr($address->CVRAdresse_doerbetegnelse ?? '');
         $cvrResult->setPostalCode($address->CVRAdresse_postnummer ?? '');
-        $city = ($address->CVRAdresse_postdistrikt ?? '') . $cvrResult->getPostalCode() ?? '';
+        $city = implode(' ', array_filter([
+          $address->CVRAdresse_postdistrikt ?? NULL,
+          $cvrResult->getPostalCode() ?? NULL,
+        ]);
         $cvrResult->setCity($city);
         $cvrResult->setMunicipalityCode($address->CVRAdresse_kommunekode ?? '');
         $address = $cvrResult->getStreet() . ' ' . $cvrResult->getHouseNr() . ' ' . $cvrResult->getFloor() . $cvrResult->getApartmentNr();