diff --git a/src/panels/config/devices/ha-config-device-page.ts b/src/panels/config/devices/ha-config-device-page.ts
index 3b9688d930..5336ae0c58 100644
--- a/src/panels/config/devices/ha-config-device-page.ts
+++ b/src/panels/config/devices/ha-config-device-page.ts
@@ -317,16 +317,14 @@ export class HaConfigDevicePage extends LitElement {
             </div>
             <div class="column">
             ${
-              isComponentLoaded(this.hass, "scene")
+              isComponentLoaded(this.hass, "scene") && entities.length
                 ? html`
                     <ha-card>
                         <div class="card-header">
                           ${this.hass.localize(
                             "ui.panel.config.devices.scene.scenes"
                           )}
-                          ${
-                            entities.length
-                              ? html`
+
                                   <paper-icon-button
                                     @click=${this._createScene}
                                     title=${this.hass.localize(
@@ -334,9 +332,6 @@ export class HaConfigDevicePage extends LitElement {
                                     )}
                                     icon="hass:plus-circle"
                                   ></paper-icon-button>
-                                `
-                              : ""
-                          }
                         </div>
 
                         ${