diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModel.kt
index cb04aa5cb1..baa291f2fa 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModel.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModel.kt
@@ -109,11 +109,6 @@ class VaultItemListingViewModel @Inject constructor(
         val fido2AssertionData = specialCircumstance as? SpecialCircumstance.Fido2Assertion
         val fido2GetCredentialsData =
             specialCircumstance as? SpecialCircumstance.Fido2GetCredentials
-        val shouldFinishOnComplete = autofillSelectionData
-            ?.shouldFinishWhenComplete
-            ?: (fido2CreationData != null ||
-                fido2AssertionData != null ||
-                fido2GetCredentialsData != null)
         val dialogState = fido2CreationData
             ?.let { VaultItemListingState.DialogState.Loading(R.string.loading.asText()) }
         VaultItemListingState(
@@ -133,7 +128,6 @@ class VaultItemListingViewModel @Inject constructor(
                 .getActivePolicies(type = PolicyTypeJson.DISABLE_SEND)
                 .any(),
             autofillSelectionData = autofillSelectionData?.autofillSelectionData,
-            shouldFinishOnComplete = shouldFinishOnComplete,
             hasMasterPassword = userState.activeAccount.hasMasterPassword,
             fido2CredentialRequest = fido2CreationData?.fido2CredentialRequest,
             fido2CredentialAssertionRequest = fido2AssertionData?.fido2AssertionRequest,
@@ -1644,7 +1638,6 @@ data class VaultItemListingState(
     val fido2CredentialRequest: Fido2CredentialRequest? = null,
     val fido2CredentialAssertionRequest: Fido2CredentialAssertionRequest? = null,
     val fido2GetCredentialsRequest: Fido2GetCredentialsRequest? = null,
-    val shouldFinishOnComplete: Boolean = false,
     val hasMasterPassword: Boolean,
     val isPremium: Boolean,
 ) {
diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModelTest.kt
index d0048a20a8..a3e8bfba7c 100644
--- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModelTest.kt
+++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModelTest.kt
@@ -206,7 +206,6 @@ class VaultItemListingViewModelTest : BaseViewModelTest() {
                     dialogState = VaultItemListingState.DialogState.Loading(
                         message = R.string.loading.asText(),
                     ),
-                    shouldFinishOnComplete = true,
                 ),
                 awaitItem(),
             )
@@ -1295,10 +1294,7 @@ class VaultItemListingViewModelTest : BaseViewModelTest() {
                         displayFolderList = emptyList(),
                     ),
                 )
-                    .copy(
-                        autofillSelectionData = autofillSelectionData,
-                        shouldFinishOnComplete = true,
-                    ),
+                    .copy(autofillSelectionData = autofillSelectionData),
                 viewModel.stateFlow.value,
             )
             coVerify {
@@ -1378,10 +1374,7 @@ class VaultItemListingViewModelTest : BaseViewModelTest() {
                         displayFolderList = emptyList(),
                     ),
                 )
-                    .copy(
-                        fido2CredentialRequest = fido2CredentialRequest,
-                        shouldFinishOnComplete = true,
-                    ),
+                    .copy(fido2CredentialRequest = fido2CredentialRequest),
                 viewModel.stateFlow.value,
             )
             coVerify {
@@ -1460,10 +1453,7 @@ class VaultItemListingViewModelTest : BaseViewModelTest() {
                         displayFolderList = emptyList(),
                     ),
                 )
-                    .copy(
-                        fido2GetCredentialsRequest = fido2GetCredentialRequest,
-                        shouldFinishOnComplete = true,
-                    ),
+                    .copy(fido2GetCredentialsRequest = fido2GetCredentialRequest),
                 viewModel.stateFlow.value,
             )
             coVerify {
@@ -3769,7 +3759,6 @@ class VaultItemListingViewModelTest : BaseViewModelTest() {
             isPullToRefreshSettingEnabled = false,
             dialogState = null,
             autofillSelectionData = null,
-            shouldFinishOnComplete = false,
             policyDisablesSend = false,
             hasMasterPassword = true,
             fido2CredentialRequest = null,