diff --git a/src/main/java/org/redisson/connection/PubSubConnectionEntry.java b/src/main/java/org/redisson/connection/PubSubConnectionEntry.java
index 11f3b2fd5..ce5850c1d 100644
--- a/src/main/java/org/redisson/connection/PubSubConnectionEntry.java
+++ b/src/main/java/org/redisson/connection/PubSubConnectionEntry.java
@@ -61,6 +61,10 @@ public class PubSubConnectionEntry {
     }
 
     public void addListener(String channelName, RedisPubSubListener<?> listener) {
+        if (listener == null) {
+            return;
+        }
+        
         Queue<RedisPubSubListener> queue = channelListeners.get(channelName);
         if (queue == null) {
             queue = new ConcurrentLinkedQueue<RedisPubSubListener>();