diff --git a/Content.Client/Lobby/LobbyState.cs b/Content.Client/Lobby/LobbyState.cs
index 0de9cf5e8f..56ae3d68ba 100644
--- a/Content.Client/Lobby/LobbyState.cs
+++ b/Content.Client/Lobby/LobbyState.cs
@@ -56,6 +56,13 @@ namespace Content.Client.Lobby
             _voteManager.SetPopupContainer(Lobby.VoteContainer);
             LayoutContainer.SetAnchorPreset(Lobby, LayoutContainer.LayoutPreset.Wide);
 
+            var lobbyNameCvar = _cfg.GetCVar(CCVars.ServerLobbyName);
+            var serverName = _baseClient.GameInfo?.ServerName ?? string.Empty;
+
+            Lobby.ServerName.Text = string.IsNullOrEmpty(lobbyNameCvar)
+                ? Loc.GetString("ui-lobby-title", ("serverName", serverName))
+                : lobbyNameCvar;
+
             var width = _cfg.GetCVar(CCVars.ServerLobbyRightPanelWidth);
             Lobby.RightSide.SetWidth = width;
 
@@ -204,9 +211,6 @@ namespace Content.Client.Lobby
 
             if (_gameTicker.ServerInfoBlob != null)
                 Lobby!.ServerInfo.SetInfoBlob(_gameTicker.ServerInfoBlob);
-
-            Lobby!.LabelName.SetMarkup("[font=\"Bedstead\" size=20] White Dream [/font]"); // WD EDIT
-            //Lobby!.ChangelogLabel.SetMarkup(Loc.GetString("ui-lobby-changelog")); // WD EDIT
         }
 
         private void UpdateLobbySoundtrackInfo(LobbySoundtrackChangedEvent ev)
diff --git a/Content.Client/Lobby/UI/LobbyGui.xaml b/Content.Client/Lobby/UI/LobbyGui.xaml
index b8d02b556e..12a4d0aed7 100644
--- a/Content.Client/Lobby/UI/LobbyGui.xaml
+++ b/Content.Client/Lobby/UI/LobbyGui.xaml
@@ -25,11 +25,11 @@
                                   HorizontalAlignment="Left" VerticalAlignment="Top" Margin="0 8" />
                     <!-- Vertical Padding -->
                     <Control VerticalExpand="True" />
-                    <RichTextLabel Name="LabelName" Access="Public" HorizontalAlignment="Left"
+                    <RichTextLabel Name="ServerName" Access="Public" HorizontalAlignment="Left"
                                    VerticalAlignment="Center" Margin="20 0 0 420" />
                     <!-- Left Bot Panel -->
                     <PanelContainer Name="BottomLeftPanel" HorizontalAlignment="Left" VerticalAlignment="Bottom">
-                        <BoxContainer Orientation="Vertical" SeparationOverride="4" Margin="2">  <!-- wwdp edit start -->
+                        <BoxContainer Orientation="Vertical" SeparationOverride="4" Margin="2">
                             <BoxContainer Orientation="Horizontal" SeparationOverride="4" Margin="6,8,6,8">
                                 <wdcontrols:CvarToggleableBoxContainer CVar="white.funny_features_enabled" Flip="True">
                                     <buttons:ViewPremiumInfoButton StyleClasses="NovaButton" SetSize="154 64">
@@ -51,7 +51,7 @@
                                     </BoxContainer>
                                 </PanelContainer>
                             </BoxContainer>
-                        </BoxContainer>   <!-- wwdp edit end -->
+                        </BoxContainer>
                     </PanelContainer>
                     <!-- Left Panel -->
                     <PanelContainer HorizontalAlignment="Left" Name="Center" VerticalAlignment="Center">
diff --git a/Content.Shared/CCVar/CCVars.Server.cs b/Content.Shared/CCVar/CCVars.Server.cs
index a3fc3d8a3f..4c3fe26f2a 100644
--- a/Content.Shared/CCVar/CCVars.Server.cs
+++ b/Content.Shared/CCVar/CCVars.Server.cs
@@ -46,7 +46,7 @@ public sealed partial class CCVars
     ///     If empty, the title will be {ui-lobby-title} + the server's full name from the hub
     /// </summary>
     public static readonly CVarDef<string> ServerLobbyName =
-        CVarDef.Create("server.lobby_name", "", CVar.REPLICATED | CVar.SERVER);
+        CVarDef.Create("server.lobby_name", "[font=\"Bedstead\" size=20] White Dream [/font]", CVar.REPLICATED | CVar.SERVER); // WD EDIT
 
     /// <summary>
     ///     The width of the right side (chat) panel in the lobby