diff --git a/android/feature/navigator/src/main/java/com/sixkids/feature/navigator/MainNavigator.kt b/android/feature/navigator/src/main/java/com/sixkids/feature/navigator/MainNavigator.kt
index 0a45a336..bbe5c76c 100644
--- a/android/feature/navigator/src/main/java/com/sixkids/feature/navigator/MainNavigator.kt
+++ b/android/feature/navigator/src/main/java/com/sixkids/feature/navigator/MainNavigator.kt
@@ -92,18 +92,18 @@ class MainNavigator(
     fun navigate(tab: MainNavigationTab) {
         val teacherNavOptions = navOptions {
             popUpTo(HomeRoute.defaultRoute) {
-//                saveState = true
+                saveState = true
             }
             launchSingleTop = true
-//            restoreState = true
+            restoreState = true
         }
 
         val studentNavOptions = navOptions {
             popUpTo(StudentHomeRoute.defaultRoute) {
-//                saveState = true
+                saveState = true
             }
             launchSingleTop = true
-//            restoreState = true
+            restoreState = true
         }
 
         when (tab) {