diff --git a/lib/OpenLayers/Map.js b/lib/OpenLayers/Map.js
index 93d412da18..f1464aa384 100644
--- a/lib/OpenLayers/Map.js
+++ b/lib/OpenLayers/Map.js
@@ -89,7 +89,7 @@ OpenLayers.Map.prototype = {
 
         this.updateSize();
         // make the entire maxExtent fix in zoom level 0 by default
-        if (this.maxResolution == null) {
+        if (this.maxResolution == null || this.resolution == "auto") {
             this.maxResolution = Math.max(
                 this.maxExtent.getWidth()  / this.size.w,
                 this.maxExtent.getHeight() / this.size.h );