diff --git a/hassio/src/addon-view/config/hassio-addon-config-tab.ts b/hassio/src/addon-view/config/hassio-addon-config-tab.ts
index 7869a6b09d..2e8d4d9b6c 100644
--- a/hassio/src/addon-view/config/hassio-addon-config-tab.ts
+++ b/hassio/src/addon-view/config/hassio-addon-config-tab.ts
@@ -29,13 +29,13 @@ class HassioAddonConfigDashboard extends LitElement {
     const hasOptions =
       this.addon.options && Object.keys(this.addon.options).length;
     const hasSchema =
-      this.addon.schema && Object.keys(this.addon.schema).length;
+      hasOptions && this.addon.schema && Object.keys(this.addon.schema).length;
 
     return html`
       <div class="content">
-        ${(hasOptions && hasSchema) || this.addon.network || this.addon.audio
+        ${hasOptions || hasSchema || this.addon.network || this.addon.audio
           ? html`
-              ${hasOptions && hasSchema
+              ${hasOptions || hasSchema
                 ? html`
                     <hassio-addon-config
                       .hass=${this.hass}
diff --git a/hassio/src/addon-view/config/hassio-addon-config.ts b/hassio/src/addon-view/config/hassio-addon-config.ts
index 139d13bcae..83e5976231 100644
--- a/hassio/src/addon-view/config/hassio-addon-config.ts
+++ b/hassio/src/addon-view/config/hassio-addon-config.ts
@@ -108,10 +108,12 @@ class HassioAddonConfig extends LitElement {
 
   protected firstUpdated(changedProps) {
     super.firstUpdated(changedProps);
-    this._canShowSchema = !this.addon.schema!.find(
-      // @ts-ignore
-      (entry) => !SUPPORTED_UI_TYPES.includes(entry.type) || entry.multiple
-    );
+    this._canShowSchema =
+      Object.keys(this.addon.options).length !== 0 &&
+      !this.addon.schema!.find(
+        // @ts-ignore
+        (entry) => !SUPPORTED_UI_TYPES.includes(entry.type) || entry.multiple
+      );
     this._yamlMode = !this._canShowSchema;
   }