diff --git a/Content.Server/GameTicking/GameTicker.Spawning.cs b/Content.Server/GameTicking/GameTicker.Spawning.cs
index 071ffa1d14..449b99dd56 100644
--- a/Content.Server/GameTicking/GameTicker.Spawning.cs
+++ b/Content.Server/GameTicking/GameTicker.Spawning.cs
@@ -91,9 +91,13 @@ namespace Content.Server.GameTicking
 
             // Pick best job best on prefs.
             jobId ??= PickBestAvailableJob(character, station);
-            // If no job available, just bail out.
+            // If no job available, stay in lobby, or if no lobby spawn as observer
             if (jobId is null)
             {
+                if (!LobbyEnabled)
+                {
+                    MakeObserve(player);
+                }
                 _chatManager.DispatchServerMessage(player, Loc.GetString("game-ticker-player-no-jobs-available-when-joining"));
                 return;
             }
@@ -183,8 +187,6 @@ namespace Content.Server.GameTicking
             if (DummyTicker)
                 return;
 
-            if (!_playersInLobby.ContainsKey(player)) return;
-
             PlayerJoinGame(player);
 
             var name = GetPlayerProfile(player).Name;