diff --git a/composeDatePicker/src/main/java/com/vsnappy1/component/Component.kt b/composeDatePicker/src/main/java/com/vsnappy1/component/Component.kt
index 32502e7..3be116f 100644
--- a/composeDatePicker/src/main/java/com/vsnappy1/component/Component.kt
+++ b/composeDatePicker/src/main/java/com/vsnappy1/component/Component.kt
@@ -73,7 +73,7 @@ fun SwipeLazyColumn(
 
     // Update selected item index
     LaunchedEffect(key1 = listState.firstVisibleItemScrollOffset) {
-        if (!isAutoScrolling && isManualScrolling) {
+        if (!isAutoScrolling && isManualScrolling && isInitialWaitOver) {
             val index =
                 listState.firstVisibleItemIndex + if (listState.firstVisibleItemScrollOffset > height.value / numberOfRowsDisplayed) 1 else 0
             onSelectedIndexChange(index)