diff --git a/src/Tgstation.Server.Host/Components/Session/SessionController.cs b/src/Tgstation.Server.Host/Components/Session/SessionController.cs index 471cbad030..f8740a0034 100644 --- a/src/Tgstation.Server.Host/Components/Session/SessionController.cs +++ b/src/Tgstation.Server.Host/Components/Session/SessionController.cs @@ -241,8 +241,9 @@ namespace Tgstation.Server.Host.Components.Session _ = process.Lifetime.ContinueWith( x => { - if (!disposed) - reattachTopicCts.Cancel(); + lock (synchronizationLock) + if (!disposed) + reattachTopicCts.Cancel(); chatTrackingContext.Active = false; }, TaskScheduler.Current);