diff --git a/src/app/organizations/vault/add-edit.component.ts b/src/app/organizations/vault/add-edit.component.ts
index ec0845f749f..fe2c3c2c710 100644
--- a/src/app/organizations/vault/add-edit.component.ts
+++ b/src/app/organizations/vault/add-edit.component.ts
@@ -42,6 +42,17 @@ export class AddEditComponent extends BaseAddEditComponent {
             eventService);
     }
 
+    protected allowOwnershipAssignment() {
+        if (this.ownershipOptions != null && this.ownershipOptions.length > 1) {
+            if (this.organization != null) {
+                return this.cloneMode && this.organization.isAdmin;
+            } else {
+                return !this.editMode || this.cloneMode;
+            }
+        }
+        return false;
+    }
+
     protected loadCollections() {
         if (!this.organization.isAdmin) {
             return super.loadCollections();
@@ -67,7 +78,7 @@ export class AddEditComponent extends BaseAddEditComponent {
     }
 
     protected async saveCipher(cipher: Cipher) {
-        if (!this.organization.isAdmin) {
+        if (!this.organization.isAdmin || cipher.organizationId == null) {
             return super.saveCipher(cipher);
         }
         if (this.editMode && !this.cloneMode) {
diff --git a/src/app/vault/add-edit.component.html b/src/app/vault/add-edit.component.html
index 176cad8ae0e..6794974b141 100644
--- a/src/app/vault/add-edit.component.html
+++ b/src/app/vault/add-edit.component.html
@@ -439,8 +439,7 @@
                         </select>
                     </div>
                 </div>
-                <ng-container
-                    *ngIf="(!editMode || cloneMode) && !organization && ownershipOptions && ownershipOptions.length > 1">
+                <ng-container *ngIf="allowOwnershipAssignment()">
                     <h3 class="mt-4">{{'ownership' | i18n}}</h3>
                     <div class="row">
                         <div class="col-5">
diff --git a/src/app/vault/add-edit.component.ts b/src/app/vault/add-edit.component.ts
index b5348f47d4a..cfac7b37593 100644
--- a/src/app/vault/add-edit.component.ts
+++ b/src/app/vault/add-edit.component.ts
@@ -154,6 +154,10 @@ export class AddEditComponent extends BaseAddEditComponent {
         }
     }
 
+    protected allowOwnershipAssignment() {
+        return (!this.editMode || this.cloneMode) && this.ownershipOptions != null && this.ownershipOptions.length > 1;
+    }
+
     private async totpTick(intervalSeconds: number) {
         const epoch = Math.round(new Date().getTime() / 1000.0);
         const mod = epoch % intervalSeconds;