diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/util/CipherViewExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/util/CipherViewExtensions.kt
index ef4aeb10d9..dbb1deda18 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/util/CipherViewExtensions.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/util/CipherViewExtensions.kt
@@ -134,12 +134,10 @@ fun VaultAddEditState.ViewState.appendFolderAndOwnerData(
                 availableFolders = folderViewList.toAvailableFolders(
                     resourceManager = resourceManager,
                 ),
-                selectedOwnerId = activeAccount.toSelectedOwnerId(
-                    cipherView = currentContentState.common.originalCipher,
-                )
-                    ?: collectionViewList.firstOrNull {
-                        it.id == currentContentState.common.selectedCollectionId
-                    }
+                selectedOwnerId = activeAccount
+                    .toSelectedOwnerId(cipherView = currentContentState.common.originalCipher)
+                    ?: collectionViewList
+                        .firstOrNull { it.id == currentContentState.common.selectedCollectionId }
                         ?.organizationId,
                 availableOwners = activeAccount.toAvailableOwners(
                     collectionViewList = collectionViewList,