diff --git a/src/angular/components/add-edit.component.ts b/src/angular/components/add-edit.component.ts
index 9a92df409b..44b4afb7eb 100644
--- a/src/angular/components/add-edit.component.ts
+++ b/src/angular/components/add-edit.component.ts
@@ -154,6 +154,11 @@ export class AddEditComponent {
             return false;
         }
 
+        if (!this.editMode && this.cipher.type == CipherType.Login && this.cipher.login.uris.length === 1 &&
+            (this.cipher.login.uris[0].uri == null || this.cipher.login.uris[0].uri === '')) {
+            this.cipher.login.uris = null;
+        }
+
         const cipher = await this.cipherService.encrypt(this.cipher);
 
         try {