diff --git a/src/panels/config/config-entries/ha-config-entries-dashboard.js b/src/panels/config/config-entries/ha-config-entries-dashboard.js
index dbce3667b3..3d5b728d28 100644
--- a/src/panels/config/config-entries/ha-config-entries-dashboard.js
+++ b/src/panels/config/config-entries/ha-config-entries-dashboard.js
@@ -44,8 +44,9 @@ class HaConfigManagerDashboard extends
     ha-state-icon {
       cursor: pointer;
     }
-    a paper-item {
+    .configured a {
       color: var(--primary-text-color);
+      text-decoration: none;
     }
   </style>
 
@@ -66,7 +67,7 @@ class HaConfigManagerDashboard extends
       </ha-config-section>
     </template>
 
-    <ha-config-section>
+    <ha-config-section class='configured'>
       <span slot="header">Configured</span>
       <paper-card>
         <template is="dom-if" if="[[!entries.length]]">
diff --git a/src/panels/config/config-entries/ha-config-entry-page.js b/src/panels/config/config-entries/ha-config-entry-page.js
index c9bbf930f9..f2c8e70d80 100644
--- a/src/panels/config/config-entries/ha-config-entry-page.js
+++ b/src/panels/config/config-entries/ha-config-entry-page.js
@@ -43,7 +43,10 @@ class HaConfigEntryPage extends NavigateMixin(EventsMixin(PolymerElement)) {
       on-click='_removeEntry'
     ></paper-icon-button>
     <div class='content'>
-      <template is='dom-repeat' items='[[_computeConfigEntryDevices(configEntry, devices)]]' as='device'>
+      <template is='dom-if' if='[[!configEntryDevices.length]]'>
+        <p>This integration has no devices.</p>
+      </template>
+      <template is='dom-repeat' items='[[configEntryDevices]]' as='device'>
         <ha-device-card
           hass='[[hass]]'
           devices='[[devices]]'
@@ -60,21 +63,30 @@ class HaConfigEntryPage extends NavigateMixin(EventsMixin(PolymerElement)) {
     return {
       hass: Object,
       isWide: Boolean,
-
       configEntry: {
         type: Object,
         value: null,
       },
 
+      configEntryDevices: {
+        type: Array,
+        computed: '_computeConfigEntryDevices(configEntry, devices)'
+      },
+
+      /**
+       * Device registry entries
+       */
+      devices: Array,
+
       /**
        * Existing entries.
        */
-      _entries: Array,
+      entries: Array,
 
       /**
        * Entity Registry entries.
        */
-      _entities: Array,
+      entities: Array,
     };
   }