diff --git a/app/src/main/java/com/sadellie/unitto/screens/MainViewModel.kt b/app/src/main/java/com/sadellie/unitto/screens/MainViewModel.kt
index 487e8829..fdaff43e 100644
--- a/app/src/main/java/com/sadellie/unitto/screens/MainViewModel.kt
+++ b/app/src/main/java/com/sadellie/unitto/screens/MainViewModel.kt
@@ -421,6 +421,9 @@ class MainViewModel @Inject constructor(
         leftSide: Boolean
     ) {
         viewModelScope.launch {
+            // Prevent user from seeing invalid list
+            unitsToShow = emptyMap()
+
             val filterGroup: Boolean = chosenUnitGroup != null
 
             // This is mostly not UI related stuff and viewModelScope.launch uses Dispatchers.Main
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 855ed373..7599ba66 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
@@ -105,13 +105,6 @@ fun SecondScreen(
     LaunchedEffect(Unit) {
         /**
          * Telling viewModel that it needs to update the list
-         * Also while the below is being computed user will composable will use cached list from viewModel
-         *
-         * User actually doesn't see cached list. Computation takes few milliseconds since we don't
-         * compute any Levenshtein distance when the screen is launched and the list is limited
-         * to a specific [UnitGroup]
-         *
-         * Adding animation/spinners will cause flickering and confuse user
          */
         viewModel.loadUnitsToShow(searchQuery, chosenUnitGroup, leftSide)
         // Scrolling chips to current group