diff --git a/app/src/main/java/io/xpipe/app/ext/Session.java b/app/src/main/java/io/xpipe/app/ext/Session.java
index 48d432391..312ceefed 100644
--- a/app/src/main/java/io/xpipe/app/ext/Session.java
+++ b/app/src/main/java/io/xpipe/app/ext/Session.java
@@ -38,16 +38,20 @@ public abstract class Session implements AutoCloseable {
                     ErrorEventFactory.fromThrowable(e).omit().handle();
                 }
 
-                try {
-                    stop();
-                } catch (Exception e) {
-                    ErrorEventFactory.fromThrowable(e).omit().handle();
-                }
+                handleSessionDeath();
             });
             return false;
         });
     }
 
+    protected void handleSessionDeath() {
+        try {
+            stop();
+        } catch (Exception e) {
+            ErrorEventFactory.fromThrowable(e).omit().handle();
+        }
+    }
+
     public abstract boolean isRunning();
 
     public abstract void start() throws Exception;