diff --git a/pinot-client/src/main/java/io/reactiverse/pinot/client/impl/VertxConnectionImpl.java b/pinot-client/src/main/java/io/reactiverse/pinot/client/impl/VertxConnectionImpl.java
index a7e8a95..ffae3b1 100644
--- a/pinot-client/src/main/java/io/reactiverse/pinot/client/impl/VertxConnectionImpl.java
+++ b/pinot-client/src/main/java/io/reactiverse/pinot/client/impl/VertxConnectionImpl.java
@@ -44,13 +44,13 @@ public VertxPreparedStatement prepareStatement(String query) {
     @Override
     public Future<ResultSetGroup> execute(String query) {
         var originalFuture = pinotConnection.executeAsync(query);
-        return Future.fromCompletionStage(originalFuture);
+        return Future.fromCompletionStage(originalFuture, vertx.getOrCreateContext());
     }
 
     @Override
     public Future<ResultSetGroup> execute(@Nullable String tableName, String query) {
         var originalFuture = pinotConnection.executeAsync(tableName, query);
-        return Future.fromCompletionStage(originalFuture);
+        return Future.fromCompletionStage(originalFuture, vertx.getOrCreateContext());
     }
 
     @Override
diff --git a/pinot-client/src/main/java/io/reactiverse/pinot/client/impl/VertxPreparedStatementImpl.java b/pinot-client/src/main/java/io/reactiverse/pinot/client/impl/VertxPreparedStatementImpl.java
index 1ca0e5b..ebd56e2 100644
--- a/pinot-client/src/main/java/io/reactiverse/pinot/client/impl/VertxPreparedStatementImpl.java
+++ b/pinot-client/src/main/java/io/reactiverse/pinot/client/impl/VertxPreparedStatementImpl.java
@@ -37,7 +37,7 @@ public VertxPreparedStatementImpl(Vertx vertx, PreparedStatement preparedStateme
     @Override
     public Future<ResultSetGroup> execute() {
         var originalFuture = preparedStatement.executeAsync();
-        return Future.fromCompletionStage(originalFuture);
+        return Future.fromCompletionStage(originalFuture, vertx.getOrCreateContext());
     }
 
     @Override