diff --git a/setup-wizard/src/app/pages/embassy/embassy.page.html b/setup-wizard/src/app/pages/embassy/embassy.page.html
index e6d0c686a..2088406d8 100644
--- a/setup-wizard/src/app/pages/embassy/embassy.page.html
+++ b/setup-wizard/src/app/pages/embassy/embassy.page.html
@@ -8,10 +8,16 @@
         </div>
 
         <ion-card color="dark">
-          <ion-card-header class="ion-text-center" style="padding-bottom: 8px;">
+          <ion-card-header class="ion-text-center" style="padding-bottom: 8px;" *ngIf="loading || storageDrives.length; else empty">
             <ion-card-title>Select Storage Drive</ion-card-title>
             <ion-card-subtitle>Select the drive where your Embassy data will be stored.</ion-card-subtitle>
           </ion-card-header>
+          <ng-template #empty>
+            <ion-card-header class="ion-text-center" style="padding-bottom: 8px;">
+              <ion-card-title>No drives found</ion-card-title>
+              <ion-card-subtitle>Please connect a storage drive to your Embassy and click "Refresh".</ion-card-subtitle>
+            </ion-card-header>
+          </ng-template>
 
           <ion-card-content class="ion-margin">
             <!-- loading -->
@@ -20,8 +26,9 @@
             <!-- not loading -->
             <ng-template #loaded>
               <ng-container *ngIf="!storageDrives.length">
-                <h2>No drives found</h2>
-                <p>Please connect a storage drive to your Embassy and click "Refresh".</p>
+                <ion-button fill="clear" color="light" (click)="getDrives()">
+                  <ion-icon color="primary" size="large" name='refresh' icon-start></ion-icon>
+                </ion-button>
               </ng-container>
   
               <ion-item-group *ngIf="storageDrives.length">
diff --git a/setup-wizard/src/app/pages/embassy/embassy.page.ts b/setup-wizard/src/app/pages/embassy/embassy.page.ts
index c58f5ce6e..9ac45a65b 100644
--- a/setup-wizard/src/app/pages/embassy/embassy.page.ts
+++ b/setup-wizard/src/app/pages/embassy/embassy.page.ts
@@ -38,6 +38,7 @@ export class EmbassyPage {
   }
 
   async getDrives () {
+    this.loading = true
     try {
       const { disks, reconnect } = await this.apiService.getDrives()
       this.storageDrives = disks.filter(d => !d.partitions.map(p => p.logicalname).includes((this.stateService.recoverySource as DiskRecoverySource)?.logicalname))
diff --git a/setup-wizard/src/app/services/api/mock-api.service.ts b/setup-wizard/src/app/services/api/mock-api.service.ts
index 106c06ceb..392b01e49 100644
--- a/setup-wizard/src/app/services/api/mock-api.service.ts
+++ b/setup-wizard/src/app/services/api/mock-api.service.ts
@@ -27,7 +27,7 @@ export class MockApiService extends ApiService {
     await pauseFor(1000)
     return {
       disks: [],
-      reconnect: ['yolo'],
+      reconnect: [],
     }
   }