diff --git a/NewHorizons/Builder/General/SpawnPointBuilder.cs b/NewHorizons/Builder/General/SpawnPointBuilder.cs
index bf6f82f6..437fb1b6 100644
--- a/NewHorizons/Builder/General/SpawnPointBuilder.cs
+++ b/NewHorizons/Builder/General/SpawnPointBuilder.cs
@@ -96,6 +96,7 @@ namespace NewHorizons.Builder.General
             suitUpQueued = false;
             if (!Locator.GetPlayerController()._isWearingSuit)
             {
+                Locator.GetPlayerSuit().SuitUp(false, true, true);
                 var spv = SearchUtilities.Find("Ship_Body/Module_Supplies/Systems_Supplies/ExpeditionGear")?.GetComponent<SuitPickupVolume>();
                 if (spv != null)
                 {
@@ -111,10 +112,6 @@ namespace NewHorizons.Builder.General
                         handler.Method.Invoke(handler.Target, new object[] { command });
                     }
                 }
-                else
-                {
-                    Locator.GetPlayerTransform().GetComponent<PlayerSpacesuit>().SuitUp(false, true, true);
-                }
             }
         }
     }