diff --git a/sample/src/main/java/com/mutualmobile/sample/ui/screens/sensorlist/SensorsListScreen.kt b/sample/src/main/java/com/mutualmobile/sample/ui/screens/sensorlist/SensorsListScreen.kt
index 4eb122c..a78e6b7 100644
--- a/sample/src/main/java/com/mutualmobile/sample/ui/screens/sensorlist/SensorsListScreen.kt
+++ b/sample/src/main/java/com/mutualmobile/sample/ui/screens/sensorlist/SensorsListScreen.kt
@@ -145,9 +145,9 @@ private val sensorStateList: List<SensorStateListener>
 @Composable
 fun SensorsListScreen() {
     var isTopBarTitleCollapsed by remember { mutableStateOf(false) }
-    val pagerState = rememberPagerState()
     val coroutineScope = rememberCoroutineScope()
     val sensorStates by rememberUpdatedState(sensorStateList)
+    val pagerState = rememberPagerState { sensorStates.size }
 
     // Trigger TopBar animation once
     LaunchedEffect(Unit) {
@@ -243,7 +243,6 @@ fun SensorsListScreen() {
         }
     ) {
         HorizontalPager(
-            pageCount = sensorStates.size,
             state = pagerState,
             contentPadding = PaddingValues(32.dp),
             beyondBoundsPageCount = 1,