diff --git a/server/bundles/io.cloudbeaver.server/schema/service.sql.graphqls b/server/bundles/io.cloudbeaver.server/schema/service.sql.graphqls
index e9d1e911a0..60cc5a7841 100644
--- a/server/bundles/io.cloudbeaver.server/schema/service.sql.graphqls
+++ b/server/bundles/io.cloudbeaver.server/schema/service.sql.graphqls
@@ -158,8 +158,6 @@ type SQLExecuteInfo {
     duration: Int!
     # Actual conditions applied to query
     filterText: String
-#    # original sql query without SQLDataFilter
-#    originalQuery: String
     # Full query that was executed, contains all used filters
     fullQuery: String
     # Results
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLExecuteInfo.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLExecuteInfo.java
index c90d0681e1..23837ec32a 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLExecuteInfo.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLExecuteInfo.java
@@ -71,7 +71,7 @@ public class WebSQLExecuteInfo {
     @Property
     public String getOriginalQuery() {
         //TODO implement
-        return null;
+        return null; // should return the original query without data filters
     }
 
     @Property