diff --git a/KfChatDotNetCli/ChatCliMain.cs b/KfChatDotNetCli/ChatCliMain.cs
index e24feb9..26ee86f 100644
--- a/KfChatDotNetCli/ChatCliMain.cs
+++ b/KfChatDotNetCli/ChatCliMain.cs
@@ -19,7 +19,7 @@ public class ChatCliMain
         _roomId = roomId;
         _client = new ChatClient(new ChatClientConfigModel
         {
-            WsUri = new Uri("wss://kiwifarms.st/chat.ws"),
+            WsUri = new Uri("wss://kiwifarms.st:9443/chat.ws"),
             XfSessionToken = xfSessionToken
         });
 
@@ -30,7 +30,11 @@ public class ChatCliMain
         _client.OnWsReconnect += OnWsReconnected;
         
         _client.StartWsClient().Wait();
-        _client.JoinRoom(_roomId);
+        if (_roomId != int.MaxValue)
+        {
+            _logger.Debug($"Joining room {_roomId}");
+            _client.JoinRoom(_roomId);
+        }
 
         while (true)
         {
@@ -79,6 +83,7 @@ public class ChatCliMain
     private void OnWsReconnected(object sender, ReconnectionInfo reconnectionInfo)
     {
         AnsiConsole.MarkupLine($"[red]Reconnected due to {reconnectionInfo.Type}[/]");
+        if (_roomId == int.MaxValue) return;
         AnsiConsole.MarkupLine($"[green]Rejoining {_roomId}[/]");
         _client.JoinRoom(_roomId);
     }
diff --git a/KfChatDotNetCli/Program.cs b/KfChatDotNetCli/Program.cs
index f6bb823..1a93c05 100644
--- a/KfChatDotNetCli/Program.cs
+++ b/KfChatDotNetCli/Program.cs
@@ -14,7 +14,7 @@ namespace KfChatDotNetCli
 
             [Option("debug", Required = false, Default = false, HelpText = "Enable debug logging")]
             public bool Debug { get; set; }
-            [Option('r', "room", Required = true, HelpText = "Room ID to join on start")]
+            [Option('r', "room", Required = false, Default = int.MaxValue, HelpText = "Room ID to join on start")]
             public int RoomId { get; set; }
         }
         static void Main(string[] args)