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 323d50df73..7869a6b09d 100644
--- a/hassio/src/addon-view/config/hassio-addon-config-tab.ts
+++ b/hassio/src/addon-view/config/hassio-addon-config-tab.ts
@@ -33,9 +33,9 @@ class HassioAddonConfigDashboard extends LitElement {
 
     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 be4a924fe9..139d13bcae 100644
--- a/hassio/src/addon-view/config/hassio-addon-config.ts
+++ b/hassio/src/addon-view/config/hassio-addon-config.ts
@@ -108,12 +108,10 @@ class HassioAddonConfig extends LitElement {
 
   protected firstUpdated(changedProps) {
     super.firstUpdated(changedProps);
-    this._canShowSchema =
-      this.addon.schema !== null &&
-      !this.addon.schema.find(
-        // @ts-ignore
-        (entry) => !SUPPORTED_UI_TYPES.includes(entry.type) || entry.multiple
-      );
+    this._canShowSchema = !this.addon.schema!.find(
+      // @ts-ignore
+      (entry) => !SUPPORTED_UI_TYPES.includes(entry.type) || entry.multiple
+    );
     this._yamlMode = !this._canShowSchema;
   }