diff --git a/src/Tgstation.Server.Host/Components/Watchdog/ISessionController.cs b/src/Tgstation.Server.Host/Components/Watchdog/ISessionController.cs
index 97e19b271d..6b21bbd6ca 100644
--- a/src/Tgstation.Server.Host/Components/Watchdog/ISessionController.cs
+++ b/src/Tgstation.Server.Host/Components/Watchdog/ISessionController.cs
@@ -88,5 +88,10 @@ namespace Tgstation.Server.Host.Components.Watchdog
 		/// Changes <see cref="RebootState"/> to <see cref="Components.Watchdog.RebootState.Normal"/> without telling the DMAPI
 		/// </summary>
 		void ResetRebootState();
+
+		/// <summary>
+		/// Enables the reading of custom chat commands from the <see cref="ISessionController"/>
+		/// </summary>
+		void EnableCustomChatCommands();
 	}
 }
diff --git a/src/Tgstation.Server.Host/Components/Watchdog/SessionController.cs b/src/Tgstation.Server.Host/Components/Watchdog/SessionController.cs
index eeacaa941a..bd46ebea5c 100644
--- a/src/Tgstation.Server.Host/Components/Watchdog/SessionController.cs
+++ b/src/Tgstation.Server.Host/Components/Watchdog/SessionController.cs
@@ -200,6 +200,8 @@ namespace Tgstation.Server.Host.Components.Watchdog
 
 			rebootTcs = new TaskCompletionSource<object>();
 
+			process.Lifetime.ContinueWith(x => chatJsonTrackingContext.Active = false, TaskScheduler.Current);
+
 			async Task<LaunchResult> GetLaunchResult()
 			{
 				var startTime = DateTimeOffset.Now;
@@ -353,6 +355,7 @@ namespace Tgstation.Server.Host.Components.Watchdog
 					case Constants.DMCommandWorldReboot:
 						if (ClosePortOnReboot)
 						{
+							chatJsonTrackingContext.Active = false;
 							content = new Dictionary<string, int> { { Constants.DMParameterData, 0 } };
 							portClosedForReboot = true;
 						}
@@ -386,6 +389,9 @@ namespace Tgstation.Server.Host.Components.Watchdog
 				throw new ObjectDisposedException(nameof(SessionController));
 		}
 
+		/// <inheritdoc />
+		public void EnableCustomChatCommands() => chatJsonTrackingContext.Active = true;
+
 		/// <inheritdoc />
 		public ReattachInformation Release()
 		{