diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/client/OpenSearchNodeClient.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/client/OpenSearchNodeClient.java
index 13fb0f6391..2b8c3d9480 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/client/OpenSearchNodeClient.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/client/OpenSearchNodeClient.java
@@ -173,7 +173,7 @@ public Map<String, String> meta() {
 
   @Override
   public void cleanup(OpenSearchRequest request) {
-    request.clean(scrollId -> client.prepareClearScroll().addScrollId(scrollId).get());
+    request.clean(scrollId -> {}/* client.prepareClearScroll().addScrollId(scrollId).get() */);
   }
 
   @Override
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/client/OpenSearchRestClient.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/client/OpenSearchRestClient.java
index d9f9dbbe5d..096899516f 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/client/OpenSearchRestClient.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/client/OpenSearchRestClient.java
@@ -174,7 +174,7 @@ public Map<String, String> meta() {
 
   @Override
   public void cleanup(OpenSearchRequest request) {
-    request.clean(scrollId -> {
+    request.clean(scrollId -> {/*
       try {
         ClearScrollRequest clearRequest = new ClearScrollRequest();
         clearRequest.addScrollId(scrollId);
@@ -182,7 +182,7 @@ public void cleanup(OpenSearchRequest request) {
       } catch (IOException e) {
         throw new IllegalStateException(
             "Failed to clean up resources for search request " + request, e);
-      }
+      }*/
     });
 
   }