diff --git a/web/js/map.js b/web/js/map.js
index fe978e1f..9771c18c 100644
--- a/web/js/map.js
+++ b/web/js/map.js
@@ -319,6 +319,11 @@ DynMap.prototype = {
 		me.world = mapWorld;
 		me.maptype = map;
 
+		me.map.addLayer(me.maptype);
+		if(me.maptype.options.maxZoom < prevzoom)
+			prevzoom = me.maptype.options.maxZoom;
+		me.map.options.maxZoom = me.maptype.options.maxZoom;
+		me.map.options.minZoom = me.maptype.options.minZoom;
 				
 		if (projectionChanged || worldChanged) {
 			var centerPoint;
@@ -329,11 +334,11 @@ DynMap.prototype = {
 			else {
 				centerPoint = me.map.getCenter();
 			}
-			me.map.setView(centerPoint, 0, true);
+			me.map.setView(centerPoint, prevzoom, true);
+		}
+		else {			
+			me.map.setZoom(prevzoom);
 		}
-		me.map.addLayer(me.maptype);
-
-		me.map.setZoom(prevzoom);
 				
 		if (worldChanged) {
 			$(me).trigger('worldchanged');