diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLProcessor.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLProcessor.java
index 3e859560f1..1cde107273 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLProcessor.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLProcessor.java
@@ -110,7 +110,7 @@ public class WebSQLProcessor {
 
     @NotNull
     public WebSQLContextInfo createContext(String defaultCatalog, String defaultSchema) throws DBCException {
-        String contextId = String.valueOf(this.contextId.incrementAndGet());
+        String contextId = connection.getId() + ":" + this.contextId.incrementAndGet();
         WebSQLContextInfo contextInfo = new WebSQLContextInfo(this, contextId, defaultCatalog, defaultSchema);
         synchronized (contexts) {
             contexts.put(contextId, contextInfo);