diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/pre/purchase/journey/composables/reusable/WheelPicker.kt b/android/navi-insurance/src/main/java/com/navi/insurance/pre/purchase/journey/composables/reusable/WheelPicker.kt
index b8b09d0cf4..acba7e962b 100644
--- a/android/navi-insurance/src/main/java/com/navi/insurance/pre/purchase/journey/composables/reusable/WheelPicker.kt
+++ b/android/navi-insurance/src/main/java/com/navi/insurance/pre/purchase/journey/composables/reusable/WheelPicker.kt
@@ -156,8 +156,9 @@ fun OpenAgePicker(
     onDismiss: (value: PickerItemData) -> Unit
 ) {
     var selectedOption by remember { mutableStateOf(selectedOptions) }
+    val pickerState = rememberPickerState()
     Dialog(
-        onDismissRequest = { selectedOption?.let { onDismiss(it) } },
+        onDismissRequest = { selectedOption?.let { onDismiss(pickerState.selectedItem) } },
         properties = DialogProperties()
     ) {
         Box(modifier = Modifier.fillMaxWidth().wrapContentHeight()) {
@@ -189,10 +190,11 @@ fun OpenAgePicker(
                     InfiniteItemsPicker(
                         items = dataList,
                         firstIndex = dataList.indexOf(selectedOption) - 1,
-                        onItemSelected = { selectedOption = it }
+                        onItemSelected = { selectedOption = it },
+                        state = pickerState
                     )
                     Button(
-                        onClick = { selectedOption?.let { onDismiss(it) } },
+                        onClick = { selectedOption?.let { onDismiss(pickerState.selectedItem) } },
                         modifier =
                             Modifier.fillMaxWidth()
                                 .padding(