diff --git a/app/src/main/java/io/xpipe/app/ext/SingletonSessionStore.java b/app/src/main/java/io/xpipe/app/ext/SingletonSessionStore.java
index 7d8c24569..c8e8512f2 100644
--- a/app/src/main/java/io/xpipe/app/ext/SingletonSessionStore.java
+++ b/app/src/main/java/io/xpipe/app/ext/SingletonSessionStore.java
@@ -54,12 +54,12 @@ public interface SingletonSessionStore<T extends Session>
                 setSessionEnabled(true);
                 s = newSession();
                 if (s != null) {
-                    s.addListener(running -> {
-                        onStateChange(running);
-                    });
                     s.start();
                     setCache("session", s);
                     onStateChange(true);
+                    s.addListener(running -> {
+                        onStateChange(running);
+                    });
                 } else {
                     setSessionEnabled(false);
                 }
@@ -79,8 +79,8 @@ public interface SingletonSessionStore<T extends Session>
                 try {
                     ex.stop();
                 } finally {
-                    setCache("session", null);
                     onStateChange(false);
+                    setCache("session", null);
                 }
             }
         }