diff --git a/src/panels/map/ha-panel-map.js b/src/panels/map/ha-panel-map.js
index 6ba87d9803..d8fcfecf36 100644
--- a/src/panels/map/ha-panel-map.js
+++ b/src/panels/map/ha-panel-map.js
@@ -64,10 +64,12 @@ class HaPanelMap extends LocalizeMixin(PolymerElement) {
     this.$.map.parentNode.appendChild(style);
     map.setView([51.505, -0.09], 13);
     Leaflet.tileLayer(
-      'https://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}.png',
+      `https://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}${Leaflet.Browser.retina ? '@2x.png' : '.png'}`,
       {
-        attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors, &copy; <a href="https://carto.com/attributions">CARTO</a>',
-        maxZoom: 18,
+        attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a>, &copy; <a href="https://carto.com/attributions">CARTO</a>',
+        subdomains: 'abcd',
+        minZoom: 0,
+        maxZoom: 20,
       }
     ).addTo(map);