diff --git a/src/Tgstation.Server.Host/Components/Session/SessionController.cs b/src/Tgstation.Server.Host/Components/Session/SessionController.cs
index fa908bed54..d57db47610 100644
--- a/src/Tgstation.Server.Host/Components/Session/SessionController.cs
+++ b/src/Tgstation.Server.Host/Components/Session/SessionController.cs
@@ -1044,7 +1044,7 @@ namespace Tgstation.Server.Host.Components.Session
 				return null;
 			}
 
-			var rebootGate = RebootGate;
+			var reboot = OnReboot;
 			if (!bypassLaunchResult)
 			{
 				var launchResult = await LaunchResult.WaitAsync(cancellationToken);
@@ -1068,11 +1068,11 @@ namespace Tgstation.Server.Host.Components.Session
 			{
 				try
 				{
-					var completed = await Task.WhenAny(Lifetime, rebootGate).WaitAsync(combinedCancellationToken);
+					var completed = await Task.WhenAny(Lifetime, reboot).WaitAsync(combinedCancellationToken);
 
 					Logger.LogDebug(
 						"Server {action}, cancelling pending command: {commandType}",
-						completed != rebootGate
+						completed != reboot
 							? "process ended"
 							: "rebooting",
 						parameters.CommandType);
diff --git a/tests/Tgstation.Server.Tests/Live/TestLiveServer.cs b/tests/Tgstation.Server.Tests/Live/TestLiveServer.cs
index 60d455c77c..e24fda6f2d 100644
--- a/tests/Tgstation.Server.Tests/Live/TestLiveServer.cs
+++ b/tests/Tgstation.Server.Tests/Live/TestLiveServer.cs
@@ -1478,24 +1478,11 @@ namespace Tgstation.Server.Tests.Live
 					var chatReadTask = instanceClient.ChatBots.List(null, cancellationToken);
 
 					// Check the DMAPI got the channels again https://github.com/tgstation/tgstation-server/issues/1490
-					var tries = 3;
-					while (true)
-						try
-						{
-							// HEY I THINK I FOUND A WAY TO RELIABLY REPRODUCE THE TOPIC HANG
-							// JUST SET A BREAKPOINT IN THE CATCH
-							// Maybe, with enough investigation, either I can figure out the cause or get Lummox to tell me
-							topicRequestResult = await WatchdogTest.StaticTopicClient.SendTopic(
-								IPAddress.Loopback,
-								$"tgs_integration_test_tactics7=1",
-								mainDDPort,
-								cancellationToken);
-							break;
-						}
-						catch (OperationCanceledException) when (--tries > 0)
-						{
-							await Task.Delay(TimeSpan.FromSeconds(5), cancellationToken);
-						}
+					topicRequestResult = await WatchdogTest.StaticTopicClient.SendTopic(
+						IPAddress.Loopback,
+						$"tgs_integration_test_tactics7=1",
+						mainDDPort,
+						cancellationToken);
 
 					Assert.IsNotNull(topicRequestResult);
 					if(!Int32.TryParse(topicRequestResult.StringData, out var channelsPresent))