diff --git a/Content.Client/Launcher/LauncherConnectingGui.xaml b/Content.Client/Launcher/LauncherConnectingGui.xaml
index 70656df7ea..007929bd32 100644
--- a/Content.Client/Launcher/LauncherConnectingGui.xaml
+++ b/Content.Client/Launcher/LauncherConnectingGui.xaml
@@ -52,7 +52,7 @@
                     </BoxContainer>
                 </BoxContainer>
             </PanelContainer>
-            <PanelContainer StyleClasses="AngleRect" HorizontalExpand="True" Margin="5 0 0 0" Name="ServersHub" MinWidth="600" MinHeight="220">
+            <PanelContainer StyleClasses="AngleRect" HorizontalExpand="True" Margin="0 10 0 0" Name="ServersHub" MinWidth="600" MinHeight="220">
                 <BoxContainer Orientation="Vertical" VerticalExpand="True" HorizontalExpand="True" Margin="3 3 3 3">
                     <ScrollContainer VerticalExpand="True" HScrollEnabled="False" HorizontalExpand="True">
                         <serversHub:ServersHub Name="ServersHubBody" Access="Public" />
diff --git a/Content.Client/Lobby/UI/LobbyGui.xaml b/Content.Client/Lobby/UI/LobbyGui.xaml
index 84d3ee909d..636165ef95 100644
--- a/Content.Client/Lobby/UI/LobbyGui.xaml
+++ b/Content.Client/Lobby/UI/LobbyGui.xaml
@@ -55,7 +55,7 @@
                                 </BoxContainer>
                             </PanelContainer>
                             <!-- Sunrise-edit: Servers Hub -->
-                            <PanelContainer StyleClasses="AngleRect" HorizontalExpand="True" Margin="5 0 0 0" Name="ServersHub" MinWidth="600" MinHeight="200">
+                            <PanelContainer StyleClasses="AngleRect" HorizontalExpand="True" Margin="0 10 0 0" Name="ServersHub" MinWidth="600" MinHeight="200">
                                 <BoxContainer Orientation="Vertical" VerticalExpand="True" HorizontalExpand="True" Margin="3 3 3 3">
                                     <ScrollContainer VerticalExpand="True" HScrollEnabled="False" HorizontalExpand="True">
                                         <serversHub:ServersHub Name="ServersHubBody" Access="Public" />
diff --git a/Content.Server/_Sunrise/ServersHub/ServersHubManager.cs b/Content.Server/_Sunrise/ServersHub/ServersHubManager.cs
index 3ca86d8ffe..7d937c868b 100644
--- a/Content.Server/_Sunrise/ServersHub/ServersHubManager.cs
+++ b/Content.Server/_Sunrise/ServersHub/ServersHubManager.cs
@@ -50,7 +50,21 @@ public sealed partial class ServersHubManager
 
     private void OnServerListChanged(string serverList)
     {
-        _serversList = serverList.Split(',').ToList();
+        var urls = new List<string>();
+
+        foreach (var serverUrl in serverList.Split(','))
+        {
+            try
+            {
+                var uri = new Uri(serverUrl);
+                urls.Add(uri.AbsoluteUri);
+            }
+            catch (UriFormatException)
+            {
+            }
+        }
+
+        _serversList = urls;
     }
 
     // Ахуенный план, надеждный блядь как швейцарские часы нахуй.
@@ -72,11 +86,11 @@ public sealed partial class ServersHubManager
 
     private async Task UpdateServerData()
     {
-        _serverDataList.Clear();
-
         if (_serversList.Count == 0)
             return;
 
+        _serverDataList.Clear();
+
         foreach (var serverUrl in _serversList)
         {
             var data = await RefreshServerData(serverUrl);