diff --git a/app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt b/app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt
index 278e3296..2cc61c26 100644
--- a/app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt
+++ b/app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt
@@ -1127,9 +1127,13 @@ class MapFragment : Fragment(), OnMapReadyCallback, MenuProvider {
             binding.search.requestFocus()
             binding.search.setSelection(locationName.length)
         }
-        if (context.checkAnyLocationPermission() && prefs.currentMapMyLocationEnabled) {
-            enableLocation(!positionSet, false)
-            positionSet = true
+        if (context.checkAnyLocationPermission()) {
+            if (prefs.currentMapMyLocationEnabled && !positionSet) {
+                enableLocation(true, false)
+                positionSet = true
+            } else {
+                enableLocation(false, false)
+            }
         }
         if (!positionSet) {
             // use position saved in preferences, fall back to default (Europe)