diff --git a/src/components/map/ha-map.ts b/src/components/map/ha-map.ts
index 2afafbb56c..b22ecfa056 100644
--- a/src/components/map/ha-map.ts
+++ b/src/components/map/ha-map.ts
@@ -136,7 +136,7 @@ export class HaMap extends ReactiveElement {
       autoFitRequired = true;
     }
 
-    if (this.autoFit && autoFitRequired) {
+    if (changedProps.has("_loaded") || (this.autoFit && autoFitRequired)) {
       this.fitMap();
     }