diff --git a/js/app.js b/js/app.js
index 79fd22a2..cd683797 100644
--- a/js/app.js
+++ b/js/app.js
@@ -53,6 +53,7 @@ import {
 } from "./feedEngine/index.js";
 import watchHistoryService from "./watchHistoryService.js";
 import r2Service from "./services/r2Service.js";
+import storageService from "./services/storageService.js";
 import {
   getVideoNoteErrorMessage,
   normalizeVideoNotePayload,
diff --git a/js/ui/profileModalController.js b/js/ui/profileModalController.js
index c888d6cb..409e9795 100644
--- a/js/ui/profileModalController.js
+++ b/js/ui/profileModalController.js
@@ -8974,6 +8974,8 @@ export class ProfileModalController {
     const storageService = this.services.storageService;
     const pubkey = this.normalizeHexPubkey(this.getActivePubkey());
 
+    this.handleClearStorage();
+
     if (!pubkey) {
       // Not logged in
       if (this.storageUnlockSection) this.storageUnlockSection.classList.add("hidden");
@@ -9300,6 +9302,8 @@ export class ProfileModalController {
     this.storageBucketInput.value = "";
     this.storagePrefixInput.value = "";
     this.storageDefaultInput.checked = false;
+    this.storageProviderInput.value = "cloudflare_r2";
+    this.updateStorageFormVisibility();
     this.setStorageFormStatus("", "info");
   }