diff --git a/src/data/history.ts b/src/data/history.ts
index 9832d4bdc508..a75772f9e05b 100644
--- a/src/data/history.ts
+++ b/src/data/history.ts
@@ -443,6 +443,11 @@ export const computeHistory = (
       ];
     }
   });
+  Object.keys(stateHistory).forEach((entityId) => {
+    if (!(entityId in localStateHistory)) {
+      localStateHistory[entityId] = stateHistory[entityId];
+    }
+  });
 
   if (!localStateHistory) {
     return { line: [], timeline: [] };