diff --git a/Logic/Actors/GeoLocationHandler.ts b/Logic/Actors/GeoLocationHandler.ts
index 3daace1726..b290ecf64d 100644
--- a/Logic/Actors/GeoLocationHandler.ts
+++ b/Logic/Actors/GeoLocationHandler.ts
@@ -138,7 +138,8 @@ export default class GeoLocationHandler {
             lat: newLocation.latitude,
         })
         const zoom = this.mapProperties.zoom
-        zoom.setData(Math.max(zoom.data, 16))
+        zoom.setData(Math.min(Math.max(zoom.data, 14), 18))
+
         this.mapHasMoved.setData(new Date())
         this.geolocationState.requestMoment.setData(undefined)
     }