diff --git a/app/src/main/java/com/sadellie/unitto/screens/second/SecondScreen.kt b/app/src/main/java/com/sadellie/unitto/screens/second/SecondScreen.kt
index 4cf2bb6d..413edc18 100644
--- a/app/src/main/java/com/sadellie/unitto/screens/second/SecondScreen.kt
+++ b/app/src/main/java/com/sadellie/unitto/screens/second/SecondScreen.kt
@@ -28,9 +28,6 @@ import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.material3.rememberTopAppBarScrollState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.LocalFocusManager
@@ -72,10 +69,6 @@ private fun BasicUnitListScreen(
     title: String,
 ) {
     val uiState = viewModel.uiState
-    val currentUnitGroup: UnitGroup? by rememberSaveable {
-        viewModel.setSelectedChip(currentUnit.group)
-        mutableStateOf(currentUnit.group)
-    }
     val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(rememberTopAppBarScrollState())
     val focusManager = LocalFocusManager.current
     val chipsRowLazyListState = rememberLazyListState()
@@ -131,10 +124,9 @@ private fun BasicUnitListScreen(
         /**
          * Telling viewModel that it needs to update the list
          */
+        viewModel.setSelectedChip(currentUnit.group)
         viewModel.loadUnitsToShow(noBrokenCurrencies)
-        currentUnitGroup?.let {
-            chipsRowLazyListState.animateScrollToItem(ALL_UNIT_GROUPS.indexOf(it))
-        }
+        chipsRowLazyListState.animateScrollToItem(ALL_UNIT_GROUPS.indexOf(currentUnit.group))
     }
 }