diff --git a/app/src/main/java/com/nextcloud/talk/location/LocationPickerActivity.kt b/app/src/main/java/com/nextcloud/talk/location/LocationPickerActivity.kt
index a413a1b50..8418f51ed 100644
--- a/app/src/main/java/com/nextcloud/talk/location/LocationPickerActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/location/LocationPickerActivity.kt
@@ -273,7 +273,7 @@ class LocationPickerActivity :
             mapController.setZoom(ZOOM_LEVEL_DEFAULT)
         }
 
-        val zoomToCurrentPositionOnFirstFix = geocodingResult == null
+        val zoomToCurrentPositionOnFirstFix = geocodingResult == null && moveToCurrentLocation
         locationOverlay.runOnFirstFix {
             if (locationOverlay.myLocation != null) {
                 myLocation = locationOverlay.myLocation