diff --git a/src/panels/lovelace/cards/hui-map-card.ts b/src/panels/lovelace/cards/hui-map-card.ts
index 4a1b8292bb..6c06d04f2a 100644
--- a/src/panels/lovelace/cards/hui-map-card.ts
+++ b/src/panels/lovelace/cards/hui-map-card.ts
@@ -33,6 +33,7 @@ import {
   HistoryStates,
   subscribeHistoryStatesTimeWindow,
 } from "../../../data/history";
+import { hasConfigOrEntitiesChanged } from "../common/has-changed";
 import { HomeAssistant } from "../../../types";
 import { findEntities } from "../common/find-entities";
 import { processConfigEntities } from "../common/process-config-entities";
@@ -187,7 +188,7 @@ class HuiMapCard extends LitElement implements LovelaceCard {
       return true;
     }
 
-    return false;
+    return hasConfigOrEntitiesChanged(this, changedProps);
   }
 
   public connectedCallback() {
@@ -203,7 +204,11 @@ class HuiMapCard extends LitElement implements LovelaceCard {
   }
 
   private _subscribeHistory() {
-    if (!isComponentLoaded(this.hass!, "history") || this._subscribed) {
+    if (
+      !isComponentLoaded(this.hass!, "history") ||
+      this._subscribed ||
+      !(this._config?.hours_to_show ?? DEFAULT_HOURS_TO_SHOW)
+    ) {
       return;
     }
     this._subscribed = subscribeHistoryStatesTimeWindow(
@@ -324,7 +329,7 @@ class HuiMapCard extends LitElement implements LovelaceCard {
       config: MapCardConfig,
       history?: HistoryStates
     ): HaMapPaths[] | undefined => {
-      if (!history) {
+      if (!history || !(config.hours_to_show ?? DEFAULT_HOURS_TO_SHOW)) {
         return undefined;
       }