diff --git a/apps/web/src/app/tools/send/send-access/send-access-email.component.html b/apps/web/src/app/tools/send/send-access/send-access-email.component.html
index 82ef9a397c5..03af33ce911 100644
--- a/apps/web/src/app/tools/send/send-access/send-access-email.component.html
+++ b/apps/web/src/app/tools/send/send-access/send-access-email.component.html
@@ -27,6 +27,7 @@
     buttonType="primary"
     [loading]="loading()"
     [block]="true"
+    [disabled]="!otp?.value"
     class="tw-mb-3"
   >
     <span>{{ "viewSend" | i18n }} </span>
diff --git a/apps/web/src/app/tools/send/send-access/send-auth.component.html b/apps/web/src/app/tools/send/send-access/send-auth.component.html
index fa5bef77274..8f9b05d7d13 100644
--- a/apps/web/src/app/tools/send/send-access/send-auth.component.html
+++ b/apps/web/src/app/tools/send/send-access/send-auth.component.html
@@ -1,13 +1,3 @@
-@if (loading()) {
-  <div class="tw-text-center">
-    <i
-      class="bwi bwi-spinner bwi-spin bwi-2x tw-text-muted"
-      title="{{ 'loading' | i18n }}"
-      aria-hidden="true"
-    ></i>
-    <span class="tw-sr-only">{{ "loading" | i18n }}</span>
-  </div>
-}
 <form [formGroup]="sendAccessForm" (ngSubmit)="onSubmit()">
   @if (error()) {
     <div class="tw-text-main tw-text-center">
diff --git a/apps/web/src/app/tools/send/send-access/send-auth.component.ts b/apps/web/src/app/tools/send/send-access/send-auth.component.ts
index 7617b0a502e..5582d6d8dcc 100644
--- a/apps/web/src/app/tools/send/send-access/send-auth.component.ts
+++ b/apps/web/src/app/tools/send/send-access/send-auth.component.ts
@@ -81,13 +81,16 @@ export class SendAuthComponent implements OnInit {
     this.loading.set(true);
     this.unavailable.set(false);
     this.error.set(false);
-    const sendEmailOtp = await this.configService.getFeatureFlag(FeatureFlag.SendEmailOTP);
-    if (sendEmailOtp) {
-      await this.attemptV2Access();
-    } else {
-      await this.attemptV1Access();
+    try {
+      const sendEmailOtp = await this.configService.getFeatureFlag(FeatureFlag.SendEmailOTP);
+      if (sendEmailOtp) {
+        await this.attemptV2Access();
+      } else {
+        await this.attemptV1Access();
+      }
+    } finally {
+      this.loading.set(false);
     }
-    this.loading.set(false);
   }
 
   onBackToEmail() {