diff --git a/redisson/src/main/java/org/redisson/connection/ConnectionManager.java b/redisson/src/main/java/org/redisson/connection/ConnectionManager.java
index 59634c085..c8ccbf8cb 100644
--- a/redisson/src/main/java/org/redisson/connection/ConnectionManager.java
+++ b/redisson/src/main/java/org/redisson/connection/ConnectionManager.java
@@ -107,13 +107,13 @@ public interface ConnectionManager {
     
     RFuture<PubSubConnectionEntry> psubscribe(String pattern, Codec codec, AsyncSemaphore semaphore, RedisPubSubListener<?>... listeners);
 
-    Codec unsubscribe(String channelName, AsyncSemaphore lock);
+    void unsubscribe(String channelName, AsyncSemaphore lock);
     
     RFuture<Codec> unsubscribe(String channelName, boolean temporaryDown);
 
     RFuture<Codec> punsubscribe(String channelName, boolean temporaryDown);
 
-    Codec punsubscribe(String channelName, AsyncSemaphore lock);
+    void punsubscribe(String channelName, AsyncSemaphore lock);
     
     void shutdown();
 
diff --git a/redisson/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java b/redisson/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java
index f8c5d7b2a..9f80bbc2e 100644
--- a/redisson/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java
+++ b/redisson/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java
@@ -587,14 +587,13 @@ public class MasterSlaveConnectionManager implements ConnectionManager {
         });
     }
 
-    public Codec unsubscribe(final String channelName, final AsyncSemaphore lock) {
+    public void unsubscribe(final String channelName, final AsyncSemaphore lock) {
         final PubSubConnectionEntry entry = name2PubSubConnection.remove(channelName);
         if (entry == null) {
             lock.release();
-            return null;
+            return;
         }
         
-        Codec entryCodec = entry.getConnection().getChannels().get(channelName);
         entry.unsubscribe(channelName, new BaseRedisPubSubListener() {
             
             @Override
@@ -612,8 +611,6 @@ public class MasterSlaveConnectionManager implements ConnectionManager {
             }
             
         });
-        
-        return entryCodec;
     }
     
     @Override
@@ -645,14 +642,13 @@ public class MasterSlaveConnectionManager implements ConnectionManager {
         return RedissonPromise.newSucceededFuture(entryCodec);
     }
     
-    public Codec punsubscribe(final String channelName, final AsyncSemaphore lock) {
+    public void punsubscribe(final String channelName, final AsyncSemaphore lock) {
         final PubSubConnectionEntry entry = name2PubSubConnection.remove(channelName);
         if (entry == null) {
             lock.release();
-            return null;
+            return;
         }
         
-        Codec entryCodec = entry.getConnection().getPatternChannels().get(channelName);
         entry.punsubscribe(channelName, new BaseRedisPubSubListener() {
             
             @Override
@@ -670,8 +666,6 @@ public class MasterSlaveConnectionManager implements ConnectionManager {
             }
             
         });
-        
-        return entryCodec;
     }