diff --git a/src/Tgstation.Server.Host/Components/Session/SessionController.cs b/src/Tgstation.Server.Host/Components/Session/SessionController.cs
index a5f6a8ca45..79b17c930b 100644
--- a/src/Tgstation.Server.Host/Components/Session/SessionController.cs
+++ b/src/Tgstation.Server.Host/Components/Session/SessionController.cs
@@ -304,7 +304,7 @@ namespace Tgstation.Server.Host.Components.Session
 			var startupTask = !reattached && (apiValidate || DMApiAvailable)
 				? initialBridgeRequestTcs.Task
 				: process.Startup;
-			var toAwait = startupTask;
+			var toAwait = Task.WhenAny(startupTask, process.Lifetime);
 
 			if (startupTimeout.HasValue)
 				toAwait = Task.WhenAny(toAwait, Task.Delay(startTime.AddSeconds(startupTimeout.Value) - startTime));