diff --git a/app/src/main/java/io/xpipe/app/core/mode/OperationMode.java b/app/src/main/java/io/xpipe/app/core/mode/OperationMode.java
index e5296c41c..fe81b1690 100644
--- a/app/src/main/java/io/xpipe/app/core/mode/OperationMode.java
+++ b/app/src/main/java/io/xpipe/app/core/mode/OperationMode.java
@@ -241,7 +241,7 @@ public abstract class OperationMode {
         }
 
         // Run a timer to always exit after some time in case we get stuck
-        if (inShutdownHook) {
+        if (!hasError) {
             ThreadHelper.runAsync(() -> {
                 ThreadHelper.sleep(25000);
                 TrackEvent.info("Shutdown took too long. Halting ...");