diff --git a/server/bundles/io.cloudbeaver.server/schema/service.sql.graphqls b/server/bundles/io.cloudbeaver.server/schema/service.sql.graphqls
index bd0a9ab515..d596095626 100644
--- a/server/bundles/io.cloudbeaver.server/schema/service.sql.graphqls
+++ b/server/bundles/io.cloudbeaver.server/schema/service.sql.graphqls
@@ -169,7 +169,8 @@ extend type Query {
 
     sqlDialectInfo( connectionId: ID! ): SQLDialectInfo
 
-    sqlListContexts( connectionId: ID! ): [ SQLContextInfo ]
+    # Lists SQL contexts for a connection (optional) or returns the particular context info
+    sqlListContexts( connectionId: ID, contextId: ID ): [ SQLContextInfo ]
 
     sqlCompletionProposals(
         connectionId: ID!,
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/DBWServiceSQL.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/DBWServiceSQL.java
index 9b291b9895..d24eec7485 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/DBWServiceSQL.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/DBWServiceSQL.java
@@ -34,6 +34,9 @@ import java.util.Map;
  */
 public interface DBWServiceSQL extends DBWService {
 
+    @WebAction
+    WebSQLContextInfo[] listContexts(@NotNull WebSession session, @Nullable String connectionId, @Nullable String contextId) throws DBWebException;
+
     @WebAction
     WebSQLDialectInfo getDialectInfo(@NotNull WebSQLProcessor processor) throws DBWebException;
 
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/impl/WebServiceSQL.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/impl/WebServiceSQL.java
index 2368123fcd..004496acd8 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/impl/WebServiceSQL.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/impl/WebServiceSQL.java
@@ -20,8 +20,10 @@ package io.cloudbeaver.service.sql.impl;
 import io.cloudbeaver.DBWebException;
 import io.cloudbeaver.WebAction;
 import io.cloudbeaver.model.WebAsyncTaskInfo;
+import io.cloudbeaver.model.WebConnectionInfo;
 import io.cloudbeaver.model.session.WebAsyncTaskProcessor;
 import io.cloudbeaver.model.session.WebSession;
+import io.cloudbeaver.service.WebServiceBindingBase;
 import io.cloudbeaver.service.sql.*;
 import org.eclipse.jface.text.Document;
 import org.jkiss.code.NotNull;
@@ -45,6 +47,8 @@ import org.jkiss.dbeaver.model.struct.DBSDataContainer;
 import org.jkiss.utils.CommonUtils;
 
 import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -53,6 +57,28 @@ import java.util.Map;
  */
 public class WebServiceSQL implements DBWServiceSQL {
 
+    @Override
+    public WebSQLContextInfo[] listContexts(@NotNull WebSession session, @Nullable String connectionId, @Nullable String contextId) throws DBWebException {
+        List<WebConnectionInfo> conToRead = new ArrayList<>();
+        if (connectionId != null) {
+            WebConnectionInfo webConnection = WebServiceBindingBase.getWebConnection(session, connectionId);
+            conToRead.add(webConnection);
+        } else {
+            conToRead.addAll(session.getConnections());
+        }
+
+        List<WebSQLContextInfo> contexts  = new ArrayList<>();
+        for (WebConnectionInfo con : conToRead) {
+            WebSQLProcessor sqlProcessor = WebServiceBindingSQL.getSQLProcessor(con);
+            WebSQLContextInfo[] conContexts = sqlProcessor.getContexts();
+            contexts.addAll(Arrays.asList(conContexts));
+        }
+        if (contextId != null) {
+            contexts.removeIf(c -> c.getId().equals(contextId));
+        }
+        return contexts.toArray(new WebSQLContextInfo[0]);
+    }
+
     @Override
     @NotNull
     public WebSQLDialectInfo getDialectInfo(@NotNull WebSQLProcessor processor) throws DBWebException {