diff --git a/packages/api/services/socket.service.ts b/packages/api/services/socket.service.ts
index d65151c..d4a8584 100644
--- a/packages/api/services/socket.service.ts
+++ b/packages/api/services/socket.service.ts
@@ -70,18 +70,28 @@ export default function InitializeWs(io: any) {
       socket.on(ServerRequestChannels.CONNECT_TO_LINE, (req: ConnectToLineRequest) => {
         // add this user to the room
 
-        const roomName = `connectedLine:${req.lineId}`;
-        socket.join(roomName);
+        const connectedRoomName = `connectedLine:${req.lineId}`;
+        const tunedRoomName = `tunedLine:${req.lineId}`;
+        socket.join(connectedRoomName);
 
         console.log(`${socket.id} user CONNECTED room for line ${Object.keys(socket.rooms)}`);
 
-        const clientUserIdsInRoom = [...(io.sockets.adapter.rooms.get(roomName) ?? [])].map(
-          (otherUserSocketId: string) => socketIdsToUserIds[otherUserSocketId],
-        );
+        const clientUserIdsInConnectedRoom = [
+          ...(io.sockets.adapter.rooms.get(connectedRoomName) ?? []),
+        ].map((otherUserSocketId: string) => socketIdsToUserIds[otherUserSocketId]);
 
-        io.in(roomName).emit(
+        const clientUserIdsInTunedRoom = [
+          ...(io.sockets.adapter.rooms.get(tunedRoomName) ?? []),
+        ].map((otherUserSocketId: string) => socketIdsToUserIds[otherUserSocketId]);
+
+        io.in(connectedRoomName).emit(
           ServerResponseChannels.SOMEONE_CONNECTED_TO_LINE,
-          new SomeoneConnectedResponse(req.lineId, userInfo.userId, clientUserIdsInRoom),
+          new SomeoneConnectedResponse(
+            req.lineId,
+            userInfo.userId,
+            clientUserIdsInConnectedRoom,
+            clientUserIdsInTunedRoom,
+          ),
         );
       });
 
diff --git a/packages/core/sockets/channels.ts b/packages/core/sockets/channels.ts
index e46df0d..2dc89da 100644
--- a/packages/core/sockets/channels.ts
+++ b/packages/core/sockets/channels.ts
@@ -31,7 +31,12 @@ export class ConnectToLineRequest {
   constructor(public lineId: string) {}
 }
 export class SomeoneConnectedResponse {
-  constructor(public lineId: string, public userId: string, public allUsers: string[]) {}
+  constructor(
+    public lineId: string,
+    public userId: string,
+    public allConnectedUsers: string[],
+    public allTunedUsers: string[],
+  ) {}
 }
 
 export class SomeoneDisconnectedResponse {
diff --git a/packages/desktop/src/providers/ConversationProvider.tsx b/packages/desktop/src/providers/ConversationProvider.tsx
index fcd8d73..a97acaa 100644
--- a/packages/desktop/src/providers/ConversationProvider.tsx
+++ b/packages/desktop/src/providers/ConversationProvider.tsx
@@ -101,7 +101,8 @@ export function ConversationProvider({ children }: { children: React.ReactNode }
           return;
         }
 
-        draft[res.lineId].connectedUserIds = res.allUsers;
+        draft[res.lineId].connectedUserIds = res.allConnectedUsers;
+        draft[res.lineId].tunedInUsers = res.allTunedUsers;
       });
     });