diff --git a/RelayClient/MainPage.xaml.cs b/RelayClient/MainPage.xaml.cs
index e4a9544..7d548af 100644
--- a/RelayClient/MainPage.xaml.cs
+++ b/RelayClient/MainPage.xaml.cs
@@ -136,10 +136,11 @@ public partial class MainPage : ContentPage
                     _currentChannelId = defaultChannel.ChannelId;
                     _currentChannelName = defaultChannel.Name;
 
-                    MainThread.BeginInvokeOnMainThread(() =>
+                    MainThread.BeginInvokeOnMainThread(async () =>
                     {
                         ChannelLabel.Text = $"#{_currentChannelName}";
                         RenderChannelList();
+                        await PushRtcContextToJsAsync();
                     });
 
                     _wsc.Send($"GET_HISTORY|{_username}|{_currentChannelId}");
@@ -166,7 +167,10 @@ public partial class MainPage : ContentPage
                 if (payload is null)
                     return;
 
-                if (payload.RecipientUsername != _username)
+                if (payload.ChannelId != _currentChannelId)
+                    return;
+
+                if (payload.SenderUsername == _username)
                     return;
 
                 var privateKey = KeyStorage.LoadPrivateKey(_username);
@@ -189,7 +193,7 @@ public partial class MainPage : ContentPage
 
                 return;
             }
-
+            
             if (type != "encrypted_chat")
                 return;
 
@@ -267,6 +271,11 @@ public partial class MainPage : ContentPage
             {
                 _currentChannelId = channel.ChannelId;
                 _currentChannelName = channel.Name;
+                
+                MainThread.BeginInvokeOnMainThread(async () =>
+                {
+                    await PushRtcContextToJsAsync();
+                });
 
                 ChannelLabel.Text = $"#{_currentChannelName}";
                 RenderCurrentChannelMessages();
@@ -353,7 +362,7 @@ public partial class MainPage : ContentPage
     {
         if (e.Message == "rtc_page_ready")
         {
-            await InitializeRtcPageAsync();
+            await PushRtcContextToJsAsync();
             return;
         }
 
@@ -388,7 +397,7 @@ public partial class MainPage : ContentPage
         {
             Type = "encrypted_rtc_signal",
             SenderUsername = _username,
-            RecipientUsername = rtcSignal.To,
+            ChannelId = rtcSignal.ChannelId,
             CipherText = encrypted.CipherText,
             Nonce = encrypted.Nonce,
             Tag = encrypted.Tag,
@@ -396,7 +405,7 @@ public partial class MainPage : ContentPage
         };
 
         _wsc.Send(JsonSerializer.Serialize(payload));
-        Console.WriteLine($"[{_username}] sent RTC signal: {rtcSignal.Type} -> {rtcSignal.To}");
+        Console.WriteLine($"[{_username}] sent RTC signal: {rtcSignal.Type} -> {rtcSignal.ChannelId}");
     }
     
     private async Task SendRtcSignalToJsAsync(string rawJson)
@@ -405,10 +414,14 @@ public partial class MainPage : ContentPage
         await hybridWebView.EvaluateJavaScriptAsync($"window.handleRtcSignal({jsArg})");
     }
     
-    private async Task InitializeRtcPageAsync()
+    private async Task PushRtcContextToJsAsync()
     {
         var usernameJson = JsonSerializer.Serialize(_username);
+        var channelIdJson = JsonSerializer.Serialize(_currentChannelId);
+
         await hybridWebView.EvaluateJavaScriptAsync($"window.setUsername({usernameJson})");
-        Console.WriteLine($"[{_username}] pushed username into HybridWebView.");
+        await hybridWebView.EvaluateJavaScriptAsync($"window.setChannelId({channelIdJson})");
+
+        Console.WriteLine($"[{_username}] pushed RTC context into HybridWebView.");
     }
 }
\ No newline at end of file
diff --git a/RelayClient/Models/RtcSignalMessage.cs b/RelayClient/Models/RtcSignalMessage.cs
index 9f3113d..d33732b 100644
--- a/RelayClient/Models/RtcSignalMessage.cs
+++ b/RelayClient/Models/RtcSignalMessage.cs
@@ -2,9 +2,9 @@
 
 public class RtcSignalMessage
 {
-    public required string Type { get; set; } // rtc_offer / rtc_answer / rtc_ice_candidate / rtc_call_request / rtc_call_accept / rtc_call_reject
+    public required string Type { get; set; } // rtc_join / rtc_offer / rtc_answer / rtc_ice_candidate / rtc_leave
     public required string From { get; set; }
-    public required string To { get; set; }
+    public required string ChannelId { get; set; }
 
     public string? Sdp { get; set; }
     public string? Candidate { get; set; }
diff --git a/RelayClient/Models/SocketRtcSignalMessage.cs b/RelayClient/Models/SocketRtcSignalMessage.cs
index e3553f8..3cab9ff 100644
--- a/RelayClient/Models/SocketRtcSignalMessage.cs
+++ b/RelayClient/Models/SocketRtcSignalMessage.cs
@@ -4,7 +4,7 @@ public class SocketRtcSignalMessage
 {
     public required string Type { get; set; } // encrypted_rtc_signal
     public required string SenderUsername { get; set; }
-    public required string RecipientUsername { get; set; }
+    public required string ChannelId { get; set; }
 
     public required string CipherText { get; set; }
     public required string Nonce { get; set; }
diff --git a/RelayClient/Resources/Raw/wwwroot/index.html b/RelayClient/Resources/Raw/wwwroot/index.html
index 624413a..dae6071 100644
--- a/RelayClient/Resources/Raw/wwwroot/index.html
+++ b/RelayClient/Resources/Raw/wwwroot/index.html
@@ -11,8 +11,8 @@
     <script>
         let peerConnection = null;
         let localStream = null;
-        let currentTarget = null;
         let currentUsername = null;
+        let currentChannelId = null;
         let availableCameras = [];
         let availableMics = [];
 
@@ -21,6 +21,11 @@
             LogMessage("Username set to: " + currentUsername);
         };
 
+        window.setChannelId = function(channelId) {
+            currentChannelId = channelId;
+            LogMessage("Channel set to: " + currentChannelId);
+        };
+
         function LogMessage(msg) {
             const messageLog = document.getElementById("messageLog");
             messageLog.value += '\r\n' + msg;
@@ -43,12 +48,12 @@
             });
 
             peerConnection.onicecandidate = async (event) => {
-                if (!event.candidate || !currentTarget || !currentUsername) return;
+                if (!event.candidate || !currentChannelId || !currentUsername) return;
 
                 const payload = {
                     type: "rtc_ice_candidate",
                     from: currentUsername,
-                    to: currentTarget,
+                    channelId: currentChannelId,
                     candidate: event.candidate.candidate,
                     sdpMid: event.candidate.sdpMid,
                     sdpMLineIndex: event.candidate.sdpMLineIndex
@@ -169,20 +174,20 @@
             }
         }
 
-        async function startCall() {
+        async function joinChannelCall() {
             LogMessage("Current username: " + currentUsername);
-            try {
-                currentTarget = document.getElementById("targetUser").value;
+            LogMessage("Current channel: " + currentChannelId);
 
-                if (!currentTarget) {
-                    LogMessage("No target user set.");
+            try {
+                if (!currentChannelId) {
+                    LogMessage("No current channel set.");
                     return;
                 }
 
                 await ensurePeerConnection();
                 await ensureLocalMedia();
-                
-                LogMessage(`Starting call with media: audio=${hasAudioTrack()} video=${hasVideoTrack()}`);
+
+                LogMessage(`Joining call with media: audio=${hasAudioTrack()} video=${hasVideoTrack()}`);
 
                 const offer = await peerConnection.createOffer();
                 await peerConnection.setLocalDescription(offer);
@@ -190,14 +195,14 @@
                 const payload = {
                     type: "rtc_offer",
                     from: currentUsername,
-                    to: currentTarget,
+                    channelId: currentChannelId,
                     sdp: offer.sdp
                 };
 
-                LogMessage("Sending offer to " + currentTarget);
+                LogMessage("Sending offer to channel " + currentChannelId);
                 await window.HybridWebView.InvokeDotNet("SendRtcSignal", [JSON.stringify(payload)]);
             } catch (err) {
-                LogMessage("startCall failed: " + err);
+                LogMessage("joinChannelCall failed: " + err);
             }
         }
 
@@ -205,13 +210,12 @@
             try {
                 const msg = typeof rawJson === "string" ? JSON.parse(rawJson) : rawJson;
 
-                LogMessage("Received signal: " + msg.type + " from " + msg.from);
+                LogMessage("Received signal: " + msg.type + " from " + msg.from + " in " + msg.channelId);
 
                 await ensurePeerConnection();
 
                 if (msg.type === "rtc_offer") {
-                    currentTarget = msg.from;
-                    LogMessage("Incoming call from " + msg.from);
+                    LogMessage("Incoming channel call offer from " + msg.from);
                     await ensureLocalMedia();
 
                     LogMessage(`Answering call with media: audio=${hasAudioTrack()} video=${hasVideoTrack()}`);
@@ -228,11 +232,11 @@
                     const payload = {
                         type: "rtc_answer",
                         from: currentUsername,
-                        to: msg.from,
+                        channelId: msg.channelId,
                         sdp: answer.sdp
                     };
 
-                    LogMessage("Sending answer to " + msg.from);
+                    LogMessage("Sending answer to channel " + msg.channelId);
                     await window.HybridWebView.InvokeDotNet("SendRtcSignal", [JSON.stringify(payload)]);
                     return;
                 }
@@ -335,10 +339,8 @@
         </div>
 
         <div>
-            <label for="targetUser">Target User:</label>
-            <input id="targetUser" type="text" value="Ru_Kira" />
             <button onclick="loadDevices()">Refresh Devices</button>
-            <button onclick="startCall()">Start Call</button>
+            <button onclick="joinChannelCall()">Join Call</button>
         </div>
 
         <div style="margin-top: 8px;">
diff --git a/RelayServer/Models/RtcSignalMessage.cs b/RelayServer/Models/RtcSignalMessage.cs
index 979a64b..0ad9bd3 100644
--- a/RelayServer/Models/RtcSignalMessage.cs
+++ b/RelayServer/Models/RtcSignalMessage.cs
@@ -2,9 +2,9 @@
 
 public class RtcSignalMessage
 {
-    public required string Type { get; set; } // rtc_offer / rtc_answer / rtc_ice_candidate / rtc_call_request / rtc_call_accept / rtc_call_reject
+    public required string Type { get; set; } // rtc_join / rtc_offer / rtc_answer / rtc_ice_candidate / rtc_leave
     public required string From { get; set; }
-    public required string To { get; set; }
+    public required string ChannelId { get; set; }
 
     public string? Sdp { get; set; }
     public string? Candidate { get; set; }
diff --git a/RelayServer/Models/SocketRtcSignalMessage.cs b/RelayServer/Models/SocketRtcSignalMessage.cs
index 47f04ad..23b3a2b 100644
--- a/RelayServer/Models/SocketRtcSignalMessage.cs
+++ b/RelayServer/Models/SocketRtcSignalMessage.cs
@@ -4,7 +4,7 @@ public class SocketRtcSignalMessage
 {
     public required string Type { get; set; } // encrypted_rtc_signal
     public required string SenderUsername { get; set; }
-    public required string RecipientUsername { get; set; }
+    public required string ChannelId { get; set; }
 
     public required string CipherText { get; set; }
     public required string Nonce { get; set; }
diff --git a/RelayServer/Services/ChatTest.cs b/RelayServer/Services/ChatTest.cs
index 90821fa..f90004e 100644
--- a/RelayServer/Services/ChatTest.cs
+++ b/RelayServer/Services/ChatTest.cs
@@ -384,29 +384,29 @@ public class ChatTest : WebSocketBehavior
             return;
         }
 
-        var targetClient = Task.Run(async () => await ClientKeyService.GetByUsernameAsync(clientPayload.RecipientUsername))
+        var allKeys = Task.Run(async () => await ClientKeyService.GetAllAsync())
             .GetAwaiter()
             .GetResult();
 
-        if (targetClient is null)
+        foreach (var client in allKeys)
         {
-            Console.WriteLine($"No target RTC client key found for {clientPayload.RecipientUsername}");
-            return;
+            if (client.Username == clientPayload.SenderUsername)
+                continue;
+
+            var encrypted = E2EeHelper.EncryptForRecipient(plainJson, client.PublicKey);
+
+            var outbound = new SocketRtcSignalMessage
+            {
+                Type = "encrypted_rtc_signal",
+                SenderUsername = clientPayload.SenderUsername,
+                ChannelId = clientPayload.ChannelId,
+                CipherText = encrypted.CipherText,
+                Nonce = encrypted.Nonce,
+                Tag = encrypted.Tag,
+                EncryptedKey = encrypted.EncryptedKey
+            };
+
+            Sessions.Broadcast(JsonSerializer.Serialize(outbound));
         }
-
-        var encrypted = E2EeHelper.EncryptForRecipient(plainJson, targetClient.PublicKey);
-
-        var outbound = new SocketRtcSignalMessage
-        {
-            Type = "encrypted_rtc_signal",
-            SenderUsername = clientPayload.SenderUsername,
-            RecipientUsername = clientPayload.RecipientUsername,
-            CipherText = encrypted.CipherText,
-            Nonce = encrypted.Nonce,
-            Tag = encrypted.Tag,
-            EncryptedKey = encrypted.EncryptedKey
-        };
-
-        Sessions.Broadcast(JsonSerializer.Serialize(outbound));
     }
 }
\ No newline at end of file