diff --git a/src/data/history.ts b/src/data/history.ts
index b0d1d4b041..0bd3bd2e3f 100644
--- a/src/data/history.ts
+++ b/src/data/history.ts
@@ -232,7 +232,8 @@ export const subscribeHistoryStatesTimeWindow = (
   hoursToShow: number,
   entityIds: string[],
   minimalResponse = true,
-  significantChangesOnly = true
+  significantChangesOnly = true,
+  noAttributes?: boolean
 ): Promise<() => Promise<void>> => {
   const params = {
     type: "history/stream",
@@ -242,9 +243,11 @@ export const subscribeHistoryStatesTimeWindow = (
     ).toISOString(),
     minimal_response: minimalResponse,
     significant_changes_only: significantChangesOnly,
-    no_attributes: !entityIds.some((entityId) =>
-      entityIdHistoryNeedsAttributes(hass, entityId)
-    ),
+    no_attributes:
+      noAttributes ??
+      !entityIds.some((entityId) =>
+        entityIdHistoryNeedsAttributes(hass, entityId)
+      ),
   };
   const stream = new HistoryStream(hass, hoursToShow);
   return hass.connection.subscribeMessage<HistoryStreamMessage>(
diff --git a/src/panels/lovelace/cards/hui-map-card.ts b/src/panels/lovelace/cards/hui-map-card.ts
index 83f4f3dc38..0e965a47d0 100644
--- a/src/panels/lovelace/cards/hui-map-card.ts
+++ b/src/panels/lovelace/cards/hui-map-card.ts
@@ -216,6 +216,7 @@ class HuiMapCard extends LitElement implements LovelaceCard {
       this._config!.hours_to_show! ?? DEFAULT_HOURS_TO_SHOW,
       this._configEntities!,
       false,
+      false,
       false
     ).catch((err) => {
       this._subscribed = undefined;