diff --git a/src/main/kotlin/com/carbonara/core/address/Address.kt b/src/main/kotlin/com/carbonara/core/address/Address.kt
index 9c4ab75..d549e66 100644
--- a/src/main/kotlin/com/carbonara/core/address/Address.kt
+++ b/src/main/kotlin/com/carbonara/core/address/Address.kt
@@ -18,7 +18,7 @@ data class Address(
     }
 
     fun createGoogleMapsLink(): String {
-        return "https://www.google.com/maps/place/?q=place_id:$googlePlaceId"
+        return "https://www.google.com/maps/search/?api=1&query=%20&query_place_id=$googlePlaceId"
     }
 }
 
diff --git a/src/test/kotlin/com/carbonara/core/address/AddressTest.kt b/src/test/kotlin/com/carbonara/core/address/AddressTest.kt
index 05a3455..f2ee59b 100644
--- a/src/test/kotlin/com/carbonara/core/address/AddressTest.kt
+++ b/src/test/kotlin/com/carbonara/core/address/AddressTest.kt
@@ -31,7 +31,7 @@ class AddressTest {
     @Test
     fun `Happy case - googleMapsLink`() {
         val result = ADDRESS.createGoogleMapsLink()
-        assertEquals("https://www.google.com/maps/place/?q=place_id:$GOOGLE_PLACE_ID", result)
+        assertEquals("https://www.google.com/maps/search/?api=1&query=%20&query_place_id=$GOOGLE_PLACE_ID", result)
     }
 
     companion object {