diff --git a/QSB/ClientServerStateSync/ServerStateManager.cs b/QSB/ClientServerStateSync/ServerStateManager.cs
index 53fea2ee..78e29965 100644
--- a/QSB/ClientServerStateSync/ServerStateManager.cs
+++ b/QSB/ClientServerStateSync/ServerStateManager.cs
@@ -131,21 +131,6 @@ internal class ServerStateManager : MonoBehaviour
 			return;
 		}
 
-		if (_currentState == ServerState.NotLoaded
-			&& QSBSceneManager.IsInUniverse
-			&& QSBPlayerManager.LocalPlayer.State is ClientState.AliveInSolarSystem or ClientState.AliveInEye)
-		{
-			switch (QSBSceneManager.CurrentScene)
-			{
-				case OWScene.SolarSystem:
-					new ServerStateMessage(ServerState.InSolarSystem).Send();
-					break;
-				case OWScene.EyeOfTheUniverse:
-					new ServerStateMessage(ServerState.InEye).Send();
-					break;
-			}
-		}
-
 		if (_currentState == ServerState.WaitingForAllPlayersToReady)
 		{
 			if (QSBPlayerManager.PlayerList.All(x