diff --git a/src/components/entity/state-badge.ts b/src/components/entity/state-badge.ts
index 4554c382fb..49df5ef061 100644
--- a/src/components/entity/state-badge.ts
+++ b/src/components/entity/state-badge.ts
@@ -53,7 +53,7 @@ class StateBadge extends LitElement {
     };
     if (stateObj) {
       // hide icon if we have entity picture
-      if (stateObj.attributes.entity_picture) {
+      if (stateObj.attributes.entity_picture && !this.overrideIcon) {
         hostStyle.backgroundImage =
           "url(" + stateObj.attributes.entity_picture + ")";
         iconStyle.display = "none";