diff --git a/panels/map/ha-panel-map.html b/panels/map/ha-panel-map.html
index 7c64e86406..e195bcb9ec 100644
--- a/panels/map/ha-panel-map.html
+++ b/panels/map/ha-panel-map.html
@@ -75,14 +75,14 @@ Polymer({
     var bounds;
 
     if (this._mapItems.length === 0) {
-      bounds = new window.L.latLngBounds(
-        [window.L.latLng(this.locationGPS.latitude, this.locationGPS.longitude)]);
+      this._map.setView(new L.LatLng(this.hass.config.core.latitude,
+                                     this.hass.config.core.longitude), 14);
     } else {
       bounds = new window.L.latLngBounds(
         this._mapItems.map(function (item) { return item.getLatLng(); }));
+      this._map.fitBounds(bounds.pad(0.5));
     }
 
-    this._map.fitBounds(bounds.pad(0.5));
   },
 
   drawEntities: function (hass) {