diff --git a/core/src/main/java/io/xpipe/core/store/SingletonSessionStore.java b/core/src/main/java/io/xpipe/core/store/SingletonSessionStore.java
index a4cc9c69a..4ca6610fb 100644
--- a/core/src/main/java/io/xpipe/core/store/SingletonSessionStore.java
+++ b/core/src/main/java/io/xpipe/core/store/SingletonSessionStore.java
@@ -69,9 +69,12 @@ public interface SingletonSessionStore<T extends Session>
             var ex = getSession();
             setSessionEnabled(false);
             if (ex != null) {
-                ex.stop();
-                setCache("session", null);
-                onStateChange(false);
+                try {
+                    ex.stop();
+                } finally {
+                    setCache("session", null);
+                    onStateChange(false);
+                }
             }
         }
     }