diff --git a/Barotrauma/BarotraumaServer/Source/Networking/GameServer.cs b/Barotrauma/BarotraumaServer/Source/Networking/GameServer.cs
index b4cdb82cc..48dfceef2 100644
--- a/Barotrauma/BarotraumaServer/Source/Networking/GameServer.cs
+++ b/Barotrauma/BarotraumaServer/Source/Networking/GameServer.cs
@@ -182,6 +182,10 @@ namespace Barotrauma.Networking
             if (SteamManager.USE_STEAM)
             {
                 SteamManager.CreateServer(this, isPublic);
+                if (isPublic)
+                {
+                    registeredToMaster = true;
+                }
             }
             if (isPublic && !GameMain.Config.UseSteamMatchmaking)
             {
diff --git a/Barotrauma/BarotraumaServer/Source/Networking/SteamManager.cs b/Barotrauma/BarotraumaServer/Source/Networking/SteamManager.cs
index 99b9ac68b..c0bbd0c9d 100644
--- a/Barotrauma/BarotraumaServer/Source/Networking/SteamManager.cs
+++ b/Barotrauma/BarotraumaServer/Source/Networking/SteamManager.cs
@@ -48,6 +48,7 @@ namespace Barotrauma.Steam
             instance.server.ServerName = server.Name;
             instance.server.MaxPlayers = server.ServerSettings.MaxPlayers;
             instance.server.Passworded = server.ServerSettings.HasPassword;
+            instance.server.MapName = GameMain.NetLobbyScreen?.SelectedSub?.DisplayName ?? "";
             Instance.server.SetKey("message", GameMain.Server.ServerSettings.ServerMessageText);
             Instance.server.SetKey("version", GameMain.Version.ToString());
             Instance.server.SetKey("contentpackage", string.Join(",", GameMain.Config.SelectedContentPackages.Select(cp => cp.Name)));