diff --git a/manager/app/src/main/java/zako/zako/zako/zakoui/screen/KernelFlash.kt b/manager/app/src/main/java/zako/zako/zako/zakoui/screen/KernelFlash.kt
index fb7b63a9..a15f5293 100644
--- a/manager/app/src/main/java/zako/zako/zako/zakoui/screen/KernelFlash.kt
+++ b/manager/app/src/main/java/zako/zako/zako/zakoui/screen/KernelFlash.kt
@@ -184,14 +184,16 @@ fun KernelFlashScreen(
         }
     }
 
-    DisposableEffect(Unit) {
+    DisposableEffect(shouldAutoExit) {
         onDispose {
-            KernelFlashStateHolder.currentState = null
-            KernelFlashStateHolder.currentUri = null
-            KernelFlashStateHolder.currentSlot = null
-            KernelFlashStateHolder.currentKpmPatchEnabled = false
-            KernelFlashStateHolder.currentKpmUndoPatch = false
-            KernelFlashStateHolder.isFlashing = false
+            if (shouldAutoExit) {
+                KernelFlashStateHolder.currentState = null
+                KernelFlashStateHolder.currentUri = null
+                KernelFlashStateHolder.currentSlot = null
+                KernelFlashStateHolder.currentKpmPatchEnabled = false
+                KernelFlashStateHolder.currentKpmUndoPatch = false
+                KernelFlashStateHolder.isFlashing = false
+            }
         }
     }