diff --git a/src/main/java/com/corundumstudio/socketio/store/RedissonPubSubStore.java b/src/main/java/com/corundumstudio/socketio/store/RedissonPubSubStore.java
index d89122b..7e5c864 100644
--- a/src/main/java/com/corundumstudio/socketio/store/RedissonPubSubStore.java
+++ b/src/main/java/com/corundumstudio/socketio/store/RedissonPubSubStore.java
@@ -15,14 +15,11 @@
  */
 package com.corundumstudio.socketio.store;
 
-import io.netty.util.internal.PlatformDependent;
-
 import java.util.Queue;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.ConcurrentMap;
 
-import org.redisson.Redisson;
+import org.redisson.RedissonClient;
 import org.redisson.core.MessageListener;
 import org.redisson.core.RTopic;
 
@@ -30,15 +27,17 @@ import com.corundumstudio.socketio.store.pubsub.PubSubListener;
 import com.corundumstudio.socketio.store.pubsub.PubSubMessage;
 import com.corundumstudio.socketio.store.pubsub.PubSubStore;
 
+import io.netty.util.internal.PlatformDependent;
+
 public class RedissonPubSubStore implements PubSubStore {
 
-    private final Redisson redissonPub;
-    private final Redisson redissonSub;
+    private final RedissonClient redissonPub;
+    private final RedissonClient redissonSub;
     private final Long nodeId;
 
     private final ConcurrentMap<String, Queue<Integer>> map = PlatformDependent.newConcurrentHashMap();
 
-    public RedissonPubSubStore(Redisson redissonPub, Redisson redissonSub, Long nodeId) {
+    public RedissonPubSubStore(RedissonClient redissonPub, RedissonClient redissonSub, Long nodeId) {
         this.redissonPub = redissonPub;
         this.redissonSub = redissonSub;
         this.nodeId = nodeId;
@@ -55,7 +54,7 @@ public class RedissonPubSubStore implements PubSubStore {
         RTopic<T> topic = redissonSub.getTopic(name);
         int regId = topic.addListener(new MessageListener<T>() {
             @Override
-            public void onMessage(T msg) {
+            public void onMessage(String channel, T msg) {
                 if (!nodeId.equals(msg.getNodeId())) {
                     listener.onMessage(msg);
                 }
diff --git a/src/main/java/com/corundumstudio/socketio/store/RedissonStore.java b/src/main/java/com/corundumstudio/socketio/store/RedissonStore.java
index 5723488..36001d8 100644
--- a/src/main/java/com/corundumstudio/socketio/store/RedissonStore.java
+++ b/src/main/java/com/corundumstudio/socketio/store/RedissonStore.java
@@ -18,13 +18,13 @@ package com.corundumstudio.socketio.store;
 import java.util.Map;
 import java.util.UUID;
 
-import org.redisson.Redisson;
+import org.redisson.RedissonClient;
 
 public class RedissonStore implements Store {
 
     private final Map<String, Object> map;
 
-    public RedissonStore(UUID sessionId, Redisson redisson) {
+    public RedissonStore(UUID sessionId, RedissonClient redisson) {
         this.map = redisson.getMap(sessionId.toString());
     }
 
diff --git a/src/main/java/com/corundumstudio/socketio/store/RedissonStoreFactory.java b/src/main/java/com/corundumstudio/socketio/store/RedissonStoreFactory.java
index ab7f092..a5a205b 100644
--- a/src/main/java/com/corundumstudio/socketio/store/RedissonStoreFactory.java
+++ b/src/main/java/com/corundumstudio/socketio/store/RedissonStoreFactory.java
@@ -19,15 +19,16 @@ import java.util.Map;
 import java.util.UUID;
 
 import org.redisson.Redisson;
+import org.redisson.RedissonClient;
 
 import com.corundumstudio.socketio.store.pubsub.BaseStoreFactory;
 import com.corundumstudio.socketio.store.pubsub.PubSubStore;
 
 public class RedissonStoreFactory extends BaseStoreFactory {
 
-    private final Redisson redisClient;
-    private final Redisson redisPub;
-    private final Redisson redisSub;
+    private final RedissonClient redisClient;
+    private final RedissonClient redisPub;
+    private final RedissonClient redisSub;
 
     private final PubSubStore pubSubStore;
 
@@ -35,7 +36,7 @@ public class RedissonStoreFactory extends BaseStoreFactory {
         this(Redisson.create());
     }
 
-    public RedissonStoreFactory(Redisson redisson) {
+    public RedissonStoreFactory(RedissonClient redisson) {
         this.redisClient = redisson;
         this.redisPub = redisson;
         this.redisSub = redisson;