diff --git a/src/panels/config/backup/dialogs/dialog-restore-backup.ts b/src/panels/config/backup/dialogs/dialog-restore-backup.ts
index bcc6ecc7bf..73555630ac 100644
--- a/src/panels/config/backup/dialogs/dialog-restore-backup.ts
+++ b/src/panels/config/backup/dialogs/dialog-restore-backup.ts
@@ -212,6 +212,9 @@ class DialogRestoreBackup extends LitElement implements HassDialog {
 
   private _subscribeBackupEvents() {
     this._unsub = subscribeBackupEvents(this.hass!, (event) => {
+      if (!this._error && event.manager_state === "idle") {
+        this.closeDialog();
+      }
       if (event.manager_state !== "restore_backup") {
         return;
       }
diff --git a/src/panels/config/backup/ha-config-backup.ts b/src/panels/config/backup/ha-config-backup.ts
index bf8be4d454..7f4a761a48 100644
--- a/src/panels/config/backup/ha-config-backup.ts
+++ b/src/panels/config/backup/ha-config-backup.ts
@@ -33,7 +33,7 @@ declare global {
 class HaConfigBackup extends SubscribeMixin(HassRouterPage) {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
-  @property({ attribute: false }) public cloudStatus!: CloudStatus;
+  @property({ attribute: false }) public cloudStatus?: CloudStatus;
 
   @property({ type: Boolean }) public narrow = false;