diff --git a/redisson/src/main/java/org/redisson/client/RedisConnection.java b/redisson/src/main/java/org/redisson/client/RedisConnection.java
index 6340a06c5..1a7fa332a 100644
--- a/redisson/src/main/java/org/redisson/client/RedisConnection.java
+++ b/redisson/src/main/java/org/redisson/client/RedisConnection.java
@@ -49,7 +49,6 @@ public class RedisConnection implements RedisCommands {
 
     private volatile RPromise<Void> fastReconnect;
     private volatile boolean closed;
-    private volatile boolean queued;
     volatile Channel channel;
 
     private RPromise<?> connectionPromise;
@@ -98,14 +97,6 @@ public class RedisConnection implements RedisCommands {
         this.pooled = pooled;
     }
 
-    public boolean isQueued() {
-        return queued;
-    }
-
-    public void setQueued(boolean queued) {
-        this.queued = queued;
-    }
-
     public void setConnectedListener(Runnable connectedListener) {
         this.connectedListener = connectedListener;
     }
diff --git a/redisson/src/main/java/org/redisson/client/handler/PingConnectionHandler.java b/redisson/src/main/java/org/redisson/client/handler/PingConnectionHandler.java
index 38a3f53ad..9efdeb34c 100644
--- a/redisson/src/main/java/org/redisson/client/handler/PingConnectionHandler.java
+++ b/redisson/src/main/java/org/redisson/client/handler/PingConnectionHandler.java
@@ -61,9 +61,8 @@ public class PingConnectionHandler extends ChannelInboundHandlerAdapter {
 
     private void sendPing(ChannelHandlerContext ctx) {
         RedisConnection connection = RedisConnection.getFrom(ctx.channel());
-        CommandData<?, ?> commandData = connection.getCurrentCommand();
         RFuture<String> future;
-        if ((commandData == null || !commandData.isBlockingCommand()) && !connection.isQueued()) {
+        if (connection.getUsage() == 0) {
             future = connection.async(StringCodec.INSTANCE, RedisCommands.PING);
         } else {
             future = null;
@@ -76,12 +75,6 @@ public class PingConnectionHandler extends ChannelInboundHandlerAdapter {
                     return;
                 }
 
-                CommandData<?, ?> commandData = connection.getCurrentCommand();
-                if (commandData != null && commandData.isBlockingCommand()) {
-                    sendPing(ctx);
-                    return;
-                }
-
                 if (future != null
                         && (future.cancel(false) || !future.isSuccess())) {
                     ctx.channel().close();
diff --git a/redisson/src/main/java/org/redisson/command/RedisExecutor.java b/redisson/src/main/java/org/redisson/command/RedisExecutor.java
index 00713b331..d8b4a05c6 100644
--- a/redisson/src/main/java/org/redisson/command/RedisExecutor.java
+++ b/redisson/src/main/java/org/redisson/command/RedisExecutor.java
@@ -516,7 +516,6 @@ public class RedisExecutor<V, R> {
         }
 
         RedisConnection connection = connectionFuture.getNow();
-        connection.setQueued(false);
         connectionManager.getShutdownLatch().release();
         if (readOnlyMode) {
             connectionManager.releaseRead(source, connection);
diff --git a/redisson/src/main/java/org/redisson/command/RedisQueuedBatchExecutor.java b/redisson/src/main/java/org/redisson/command/RedisQueuedBatchExecutor.java
index 821155aab..93809b9ab 100644
--- a/redisson/src/main/java/org/redisson/command/RedisQueuedBatchExecutor.java
+++ b/redisson/src/main/java/org/redisson/command/RedisQueuedBatchExecutor.java
@@ -132,8 +132,6 @@ public class RedisQueuedBatchExecutor<V, R> extends BaseRedisBatchExecutor<V, R>
     
     @Override
     protected void sendCommand(RPromise<R> attemptPromise, RedisConnection connection) {
-        connection.setQueued(true);
-
         MasterSlaveEntry msEntry = getEntry(source);
         ConnectionEntry connectionEntry = connections.get(msEntry);