diff --git a/lib/OpenLayers/Map.js b/lib/OpenLayers/Map.js
index 1a834b6a4f..290a1166d7 100644
--- a/lib/OpenLayers/Map.js
+++ b/lib/OpenLayers/Map.js
@@ -327,6 +327,15 @@ OpenLayers.Map.prototype = {
             this.layerContainerDiv.removeChild(layer.div);
         }
         this.layers.remove(layer);
+        if (this.baseLayer == layer) {
+            this.baseLayer = null;
+            for(i=0; i < this.layers.length; i++) {
+                if ( (this.baseLayer == null) && (this.layers[i].isBaseLayer()) ) {
+                    this.baseLayer = this.layers[i];
+                    continue;
+                }
+            }
+        }
         layer.map = null;
         this.events.triggerEvent("removelayer");
     },