diff --git a/jdbc/src/main/java/tech/ydb/jdbc/context/YdbContext.java b/jdbc/src/main/java/tech/ydb/jdbc/context/YdbContext.java
index 1ac694f..200a54f 100644
--- a/jdbc/src/main/java/tech/ydb/jdbc/context/YdbContext.java
+++ b/jdbc/src/main/java/tech/ydb/jdbc/context/YdbContext.java
@@ -392,7 +392,8 @@ public YdbPreparedQuery findOrPrepareParams(YdbQuery query, YdbPrepareMode mode)
             }
         }
 
-        if (type == QueryType.EXPLAIN_QUERY || type == QueryType.SCHEME_QUERY) {
+        if (type == QueryType.EXPLAIN_QUERY || type == QueryType.SCHEME_QUERY ||
+                !queryOptions.isPrepareDataQueries() || mode == YdbPrepareMode.IN_MEMORY) {
             return new InMemoryQuery(query, queryOptions.isDeclareJdbcParameters());
         }
 
@@ -432,9 +433,7 @@ public YdbPreparedQuery findOrPrepareParams(YdbQuery query, YdbPrepareMode mode)
             }
         }
 
-        if (!query.isPlainYQL()
-                || mode == YdbPrepareMode.IN_MEMORY
-                || !queryOptions.isPrepareDataQueries()) {
+        if (!query.isPlainYQL()) {
             return new InMemoryQuery(query, queryOptions.isDeclareJdbcParameters());
         }