diff --git a/src/data/history.ts b/src/data/history.ts
index a110c8c634..baece3da37 100644
--- a/src/data/history.ts
+++ b/src/data/history.ts
@@ -470,9 +470,15 @@ export const computeHistory = (
       }[domain];
     }
 
-    const deviceClass: string | undefined = (
-      currentState?.attributes || numericStateFromHistory?.a
-    )?.device_class;
+    const specialDomainClasses = {
+      climate: "temperature",
+      humidifier: "humidity",
+      water_heater: "temperature",
+    };
+
+    const deviceClass: string | undefined =
+      specialDomainClasses[domain] ||
+      (currentState?.attributes || numericStateFromHistory?.a)?.device_class;
 
     const key = computeGroupKey(unit, deviceClass, splitDeviceClasses);