diff --git a/packages/CredentialManager/src/com/android/credentialmanager/createflow/CreatePasskeyComponents.kt b/packages/CredentialManager/src/com/android/credentialmanager/createflow/CreatePasskeyComponents.kt
index 60a8e4b24d571..fbec1bc75dc6b 100644
--- a/packages/CredentialManager/src/com/android/credentialmanager/createflow/CreatePasskeyComponents.kt
+++ b/packages/CredentialManager/src/com/android/credentialmanager/createflow/CreatePasskeyComponents.kt
@@ -79,10 +79,8 @@ fun CreatePasskeyScreen(
     sheetShape = Shapes.medium,
   ) {}
   LaunchedEffect(state.currentValue) {
-    when (state.currentValue) {
-      ModalBottomSheetValue.Hidden -> {
-        cancelActivity()
-      }
+    if (state.currentValue == ModalBottomSheetValue.Hidden) {
+      cancelActivity()
     }
   }
 }
diff --git a/packages/CredentialManager/src/com/android/credentialmanager/getflow/GetCredentialComponents.kt b/packages/CredentialManager/src/com/android/credentialmanager/getflow/GetCredentialComponents.kt
index 4b957e84fc2b2..1ca70ed91598a 100644
--- a/packages/CredentialManager/src/com/android/credentialmanager/getflow/GetCredentialComponents.kt
+++ b/packages/CredentialManager/src/com/android/credentialmanager/getflow/GetCredentialComponents.kt
@@ -64,10 +64,8 @@ fun GetCredentialScreen(
     sheetShape = Shapes.medium,
   ) {}
   LaunchedEffect(state.currentValue) {
-    when (state.currentValue) {
-      ModalBottomSheetValue.Hidden -> {
-        cancelActivity()
-      }
+    if (state.currentValue == ModalBottomSheetValue.Hidden) {
+      cancelActivity()
     }
   }
 }