diff --git a/src/angular/components/send/add-edit.component.ts b/src/angular/components/send/add-edit.component.ts
index 34764b35375..96e9d6ff01c 100644
--- a/src/angular/components/send/add-edit.component.ts
+++ b/src/angular/components/send/add-edit.component.ts
@@ -187,6 +187,10 @@ export class AddEditComponent implements OnInit {
             }
         }
 
+        if (this.password != null && this.password.trim() === '') {
+            this.password = null;
+        }
+
         const encSend = await this.encryptSend(file);
         try {
             this.formPromise = this.sendService.saveWithServer(encSend);