diff --git a/src/common/entity/compute_state_name.ts b/src/common/entity/compute_state_name.ts
index 2311830a9c..dc599caa0a 100644
--- a/src/common/entity/compute_state_name.ts
+++ b/src/common/entity/compute_state_name.ts
@@ -7,7 +7,7 @@ export const computeStateNameFromEntityAttributes = (
 ): string =>
   attributes.friendly_name === undefined
     ? computeObjectId(entityId).replace(/_/g, " ")
-    : attributes.friendly_name || "";
+    : (attributes.friendly_name ?? "").toString();
 
 export const computeStateName = (stateObj: HassEntity): string =>
   computeStateNameFromEntityAttributes(stateObj.entity_id, stateObj.attributes);