From 170882f69d9987e346a1e918d7efbb50249e4c15 Mon Sep 17 00:00:00 2001
From: Serge Rider <serge@dbeaver.com>
Date: Wed, 1 Apr 2026 18:35:48 +0200
Subject: [PATCH] dbeaver/pro#8894 Fix session cleanup

---
 .../src/io/cloudbeaver/model/session/BaseWebSession.java   | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/BaseWebSession.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/BaseWebSession.java
index c2fcd10543..d911b165b9 100644
--- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/BaseWebSession.java
+++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/BaseWebSession.java
@@ -27,6 +27,7 @@ import org.jkiss.dbeaver.model.auth.SMAuthInfo;
 import org.jkiss.dbeaver.model.auth.SMAuthSpace;
 import org.jkiss.dbeaver.model.auth.SMSessionContext;
 import org.jkiss.dbeaver.model.auth.impl.AbstractSessionPersistent;
+import org.jkiss.dbeaver.model.impl.auth.SessionContextImpl;
 import org.jkiss.dbeaver.model.meta.Property;
 import org.jkiss.dbeaver.model.rm.RMProjectInfo;
 import org.jkiss.dbeaver.model.security.user.SMTeam;
@@ -151,8 +152,10 @@ public abstract class BaseWebSession extends AbstractSessionPersistent {
     }
 
     protected synchronized void clearSessionContext() {
-        this.workspace.getAuthContext().clearContext();
-        this.workspace.getAuthContext().addSession(this);
+        SessionContextImpl authContext = this.workspace.getAuthContext();
+        authContext.removeSession(this);
+        authContext.clearContext();
+        authContext.addSession(this);
     }
 
     @NotNull