diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/SocketConnectionBase.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/SocketConnectionBase.java
index af411b86bb..614d52a73b 100644
--- a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/SocketConnectionBase.java
+++ b/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/SocketConnectionBase.java
@@ -134,6 +134,7 @@ public void init() {
         handleException(e);
       }
     });
+    socket.readCompletionHandler(this::handleReadComplete);
   }
 
   public NetSocketInternal socket() {
@@ -313,13 +314,16 @@ protected void handleMessage(Object msg) {
       inflight--;
       CommandResponse resp =(CommandResponse) msg;
       resp.fire();
-      checkPending();
     } else if (msg instanceof InvalidCachedStatementEvent) {
       InvalidCachedStatementEvent event = (InvalidCachedStatementEvent) msg;
       removeCachedStatement(event.sql());
     }
   }
 
+  private void handleReadComplete(Void v) {
+    checkPending();
+  }
+
   protected void handleEvent(Object event) {
     if (holder != null) {
       holder.handleEvent(event);