diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2bc385ac7..4cf1f5fc9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,5 @@
+* Excluded `Query()` method from interface `ydb.Connection`. Method `Query()` remains accessible from `ydb.Driver`
+
 ## v3.71.0
 * Added `query/ResultSet.{Columns,ColumnTypes}` methods for get column names and types from query result set
 * Added experimental `retry.RetryWithResult` helper for retry lambda and return value from lambda
diff --git a/connection.go b/connection.go
index 14adc7470..cc82bd979 100644
--- a/connection.go
+++ b/connection.go
@@ -5,7 +5,6 @@ import (
 
 	"github.com/ydb-platform/ydb-go-sdk/v3/coordination"
 	"github.com/ydb-platform/ydb-go-sdk/v3/discovery"
-	"github.com/ydb-platform/ydb-go-sdk/v3/query"
 	"github.com/ydb-platform/ydb-go-sdk/v3/ratelimiter"
 	"github.com/ydb-platform/ydb-go-sdk/v3/scheme"
 	"github.com/ydb-platform/ydb-go-sdk/v3/scripting"
@@ -35,11 +34,6 @@ type Connection interface { //nolint:interfacebloat
 	// Table returns table client
 	Table() table.Client
 
-	// Query returns query client
-	//
-	// Experimental: https://github.com/ydb-platform/ydb-go-sdk/blob/master/VERSIONING.md#experimental
-	Query() query.Client
-
 	// Scheme returns scheme client
 	Scheme() scheme.Client
 
diff --git a/driver.go b/driver.go
index 7ef1e765d..b84c70981 100644
--- a/driver.go
+++ b/driver.go
@@ -38,7 +38,6 @@ import (
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xsql"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xsync"
 	"github.com/ydb-platform/ydb-go-sdk/v3/log"
-	"github.com/ydb-platform/ydb-go-sdk/v3/query"
 	"github.com/ydb-platform/ydb-go-sdk/v3/ratelimiter"
 	"github.com/ydb-platform/ydb-go-sdk/v3/scheme"
 	"github.com/ydb-platform/ydb-go-sdk/v3/scripting"
@@ -192,7 +191,7 @@ func (d *Driver) Table() table.Client {
 // Query returns query client
 //
 // Experimental: https://github.com/ydb-platform/ydb-go-sdk/blob/master/VERSIONING.md#experimental
-func (d *Driver) Query() query.Client {
+func (d *Driver) Query() *internalQuery.Client {
 	return d.query.Get()
 }