diff --git a/src/common/entity/compute_state_name.ts b/src/common/entity/compute_state_name.ts
index 487ea67dd9..57cf9bef45 100644
--- a/src/common/entity/compute_state_name.ts
+++ b/src/common/entity/compute_state_name.ts
@@ -2,5 +2,6 @@ import { HassEntity } from "home-assistant-js-websocket";
 import computeObjectId from "./compute_object_id";
 
 export default (stateObj: HassEntity): string =>
-  stateObj.attributes.friendly_name ||
-  computeObjectId(stateObj.entity_id).replace(/_/g, " ");
+  stateObj.attributes.friendly_name === undefined
+    ? computeObjectId(stateObj.entity_id).replace(/_/g, " ")
+    : stateObj.attributes.friendly_name || "";