diff --git a/src/common/entity/color/battery_color.ts b/src/common/entity/color/battery_color.ts
index 839dbe8c39..daa3715450 100644
--- a/src/common/entity/color/battery_color.ts
+++ b/src/common/entity/color/battery_color.ts
@@ -1,7 +1,5 @@
-import { HassEntity } from "home-assistant-js-websocket";
-
-export const batteryStateColor = (stateObj: HassEntity) => {
-  const value = Number(stateObj.state);
+export const batteryStateColor = (state: string) => {
+  const value = Number(state);
   if (isNaN(value)) {
     return "sensor-battery-unknown";
   }
diff --git a/src/common/entity/color/person_color.ts b/src/common/entity/color/person_color.ts
index 7f76a62893..e1158ab8e1 100644
--- a/src/common/entity/color/person_color.ts
+++ b/src/common/entity/color/person_color.ts
@@ -1,7 +1,5 @@
-import { HassEntity } from "home-assistant-js-websocket";
-
-export const personColor = (stateObj: HassEntity): string | undefined => {
-  switch (stateObj.state) {
+export const personColor = (state: string): string | undefined => {
+  switch (state) {
     case "home":
       return "person-home";
     default:
diff --git a/src/common/entity/color/sensor_color.ts b/src/common/entity/color/sensor_color.ts
index 3422a68704..5da0eeb0a2 100644
--- a/src/common/entity/color/sensor_color.ts
+++ b/src/common/entity/color/sensor_color.ts
@@ -1,11 +1,14 @@
 import { HassEntity } from "home-assistant-js-websocket";
 import { batteryStateColor } from "./battery_color";
 
-export const sensorColor = (stateObj: HassEntity): string | undefined => {
+export const sensorColor = (
+  stateObj: HassEntity,
+  compareState: string
+): string | undefined => {
   const deviceClass = stateObj?.attributes.device_class;
 
   if (deviceClass === "battery") {
-    return batteryStateColor(stateObj);
+    return batteryStateColor(compareState);
   }
 
   return undefined;
diff --git a/src/common/entity/state_color.ts b/src/common/entity/state_color.ts
index 6ac74f5fa1..4cf278e231 100644
--- a/src/common/entity/state_color.ts
+++ b/src/common/entity/state_color.ts
@@ -67,10 +67,10 @@ export const stateColor = (stateObj: HassEntity, state?: string) => {
 
     case "person":
     case "device_tracker":
-      return personColor(stateObj);
+      return personColor(compareState);
 
     case "sensor":
-      return sensorColor(stateObj);
+      return sensorColor(stateObj, compareState);
 
     case "sun":
       return compareState === "above_horizon" ? "sun-day" : "sun-night";