diff --git a/src/main/java/com/lambdaworks/redis/pubsub/PubSubCommandHandler.java b/src/main/java/com/lambdaworks/redis/pubsub/PubSubCommandHandler.java
index 787b4e0..22f717d 100644
--- a/src/main/java/com/lambdaworks/redis/pubsub/PubSubCommandHandler.java
+++ b/src/main/java/com/lambdaworks/redis/pubsub/PubSubCommandHandler.java
@@ -36,7 +36,7 @@ public PubSubCommandHandler(BlockingQueue<Command<K, V, ?>> queue, RedisCodec<K,
 
     @Override
     protected void decode(ChannelHandlerContext ctx, ChannelBuffer buffer) throws InterruptedException {
-        while (!queue.isEmpty()) {
+        while (output.type() == null && !queue.isEmpty()) {
             CommandOutput<K, V, ?> output = queue.peek().getOutput();
             if (!rsm.decode(buffer, output)) return;
             queue.take().complete();