diff --git a/src/components/ha-addon-picker.ts b/src/components/ha-addon-picker.ts
index 87a989d18f..099da62e9f 100644
--- a/src/components/ha-addon-picker.ts
+++ b/src/components/ha-addon-picker.ts
@@ -58,12 +58,12 @@ class HaAddonPicker extends LitElement {
   }
 
   protected render() {
-    if (!this._addons) {
-      return nothing;
-    }
     if (this._error) {
       return html`<ha-alert alert-type="error">${this._error}</ha-alert>`;
     }
+    if (!this._addons) {
+      return nothing;
+    }
     return html`
       <ha-combo-box
         .hass=${this.hass}
diff --git a/src/components/ha-mount-picker.ts b/src/components/ha-mount-picker.ts
index b0391849dd..fd47688001 100644
--- a/src/components/ha-mount-picker.ts
+++ b/src/components/ha-mount-picker.ts
@@ -45,12 +45,12 @@ class HaMountPicker extends LitElement {
   }
 
   protected render() {
-    if (!this._mounts) {
-      return nothing;
-    }
     if (this._error) {
       return html`<ha-alert alert-type="error">${this._error}</ha-alert>`;
     }
+    if (!this._mounts) {
+      return nothing;
+    }
     const dataDiskOption = html`<ha-list-item
       graphic="icon"
       .value=${__BACKUP_DATA_DISK__}