diff --git a/app/src/main/java/com/adevinta/mappicker/MainActivity.kt b/app/src/main/java/com/adevinta/mappicker/MainActivity.kt
index 96871c57..79fb54ba 100644
--- a/app/src/main/java/com/adevinta/mappicker/MainActivity.kt
+++ b/app/src/main/java/com/adevinta/mappicker/MainActivity.kt
@@ -143,6 +143,7 @@ class MainActivity : AppCompatActivity() {
 private fun onLaunchMapPickerClicked(context: Context) {
     val activity = context as MainActivity
     val locationPickerIntent = LocationPickerActivity.Builder(activity)
+        .withLocation(DEMO_LATITUDE, DEMO_LONGITUDE)
         // .withGeolocApiKey("<PUT API KEY HERE>")
         // .withGooglePlacesApiKey("<PUT API KEY HERE>")
         .withSearchZone("es_ES")
diff --git a/leku/src/main/java/com/adevinta/leku/LocationPickerActivity.kt b/leku/src/main/java/com/adevinta/leku/LocationPickerActivity.kt
index 6b6d0d8b..0db3338a 100644
--- a/leku/src/main/java/com/adevinta/leku/LocationPickerActivity.kt
+++ b/leku/src/main/java/com/adevinta/leku/LocationPickerActivity.kt
@@ -1,11 +1,13 @@
 package com.adevinta.leku
 
+import android.Manifest
 import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.ActivityNotFoundException
 import android.content.Context
 import android.content.Intent
 import android.content.IntentSender
+import android.content.pm.PackageManager
 import android.content.res.Resources
 import android.graphics.PorterDuff
 import android.location.Address
@@ -39,6 +41,7 @@ import androidx.activity.result.ActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.annotation.RawRes
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -1213,11 +1216,13 @@ class LocationPickerActivity :
     }
 
     private fun setDefaultLocation() {
-        currentLocation = Location(getString(R.string.leku_network_resource))
-        currentLocation?.latitude = 0.0
-        currentLocation?.longitude = 0.0
-        setCurrentPositionLocation()
-        isLocationInformedFromBundle = true
+        if (ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
+            currentLocation = Location(getString(R.string.leku_network_resource))
+            currentLocation?.latitude = 0.0
+            currentLocation?.longitude = 0.0
+            setCurrentPositionLocation()
+            isLocationInformedFromBundle = true
+        }
     }
 
     private fun startVoiceRecognitionActivity() {