diff --git a/src/components/elements/Controls.vue b/src/components/elements/Controls.vue
index 05ed6b41..64ae5fef 100644
--- a/src/components/elements/Controls.vue
+++ b/src/components/elements/Controls.vue
@@ -1,4 +1,6 @@
 <script setup lang="ts">
+import { ref } from 'vue'
+import IconCircleSpinner from '../icons/icon-circle-spinner.vue'
 import Button from '@/components/atoms/Button.vue'
 import GeolocationIcon from '@/components/icons/icon-geolocation.vue'
 import MinusIcon from '@/components/icons/icon-minus.vue'
@@ -6,10 +8,21 @@ import PlusIcon from '@/components/icons/icon-plus.vue'
 import { useGeoIp } from '@/composables/useGeoLocation'
 import { useMap } from '@/stores/map'
 
-const { browserPositionIsSupported, geolocateUserViaBrowser, geolocatingUserBrowser } = useGeoIp()
+const isGeolocationLoading = ref(false)
+const { browserPositionIsSupported, ipPosition, ipPositionError, geolocateIp, geolocateUserViaBrowser, geolocatingUserBrowser, errorBrowser } = useGeoIp()
 
 async function setBrowserPosition() {
+  isGeolocationLoading.value = true
   const browserPosition = await geolocateUserViaBrowser()
+  if (errorBrowser.value) {
+    alert(`${errorBrowser.value.message}. Moving to closest location`)
+    await geolocateIp()
+    if (!ipPositionError.value && ipPosition.value)
+      useMap().setPosition(ipPosition.value)
+    isGeolocationLoading.value = false
+    return
+  }
+  isGeolocationLoading.value = false
   useMap().setPosition(browserPosition)
 }
 </script>
@@ -19,10 +32,12 @@ async function setBrowserPosition() {
     <Button
       v-if="browserPositionIsSupported"
       :disabled="geolocatingUserBrowser" style="width: 34px; height: 34px" bg-color="white" size="sm" :aria-label="$t('Show your location')"
-      :title="$t('Show your location')" @click="setBrowserPosition"
+      :title="$t('Show your location')"
+      @click="setBrowserPosition"
     >
       <template #icon>
-        <GeolocationIcon />
+        <GeolocationIcon v-if="!isGeolocationLoading" />
+        <IconCircleSpinner v-else class="w-4 h-4 text-space" />
       </template>
     </Button>