diff --git a/src/Entity/Place.php b/src/Entity/Place.php
index 2ee94782..cf9d8518 100644
--- a/src/Entity/Place.php
+++ b/src/Entity/Place.php
@@ -285,10 +285,25 @@ class Place
         $this->setHasOpeningHours(!empty($tags['opening_hours']));
         $this->setHasWheelchair(!empty($tags['wheelchair']));
 
-        // has address logic
+        // has address logic, we set it as complete if there is a set of street AND housenumber in tags, it could be with addr prefix or contact prefix.
+        $this->setHasAddress(
+            !empty($this->getStreet()) && !empty($this->getHousenumber())
+            || 
+            (
+             isset($tags['addr:street']) && 
+            isset($tags['addr:housenumber']) &&
+            $tags['addr:street'] != '' &&
+            $tags['addr:housenumber'] != ''
+            )
+            || 
+            (
+             isset($tags['contact:street']) && 
+            isset($tags['contact:housenumber']) &&
+            $tags['contact:street'] != '' &&
+            $tags['contact:housenumber'] != ''
+            )
 
-        $this->setHasAddress(!empty($this->getStreet()) && !empty($this->getHousenumber())
-            | (isset($tags['addr:street']) && isset($tags['addr:housenumber'])));
+        );
 
         // has website logic (with multiple possible tags)
         $websiteTags = ['website', 'contact:website', 'url', 'contact:url'];