diff --git a/server/socket/index.js b/server/socket/index.js
index be8fb0a..3fe1c1e 100644
--- a/server/socket/index.js
+++ b/server/socket/index.js
@@ -4,8 +4,8 @@ module.exports = io => {
     socket.join('#chat', () => {
       sendAllRooms()
       sendAllUsers()
-      socket.emit('get my rooms', socket.rooms)
       send_rooms()
+      send_user_rooms()
     })
 
     socket.on('message', message => {
@@ -27,6 +27,7 @@ module.exports = io => {
       console.log('join:', roomName)
       socket.join(roomName, () => {
         sendAllRooms()
+        send_user_rooms()
       })
     })
 
@@ -77,11 +78,12 @@ module.exports = io => {
       )
     }
     function send_user_rooms() {
+      console.log(socket.rooms)
       socket.emit(
         'received my rooms',
-        Object.keys(socket.rooms).map(k => ({
+        Object.keys(io.sockets.adapter.rooms).map(k => ({
           roomName: k,
-          sockets: socket.rooms[k]['socket'],
+          sockets: io.sockets.adapter.rooms[k]['sockets'],
         }))
       )
     }
diff --git a/src/App.js b/src/App.js
index 3c9699f..a632e70 100644
--- a/src/App.js
+++ b/src/App.js
@@ -27,6 +27,7 @@ class App extends React.Component {
 
   async fetchData() {
     this.setState({ loading: false })
+    this.socket.emit('get my rooms')
   }
 
   componentDidMount() {