diff --git a/src/Tgstation.Server.Host/Components/InstanceManager.cs b/src/Tgstation.Server.Host/Components/InstanceManager.cs index cf9a079956..65fb3f981b 100644 --- a/src/Tgstation.Server.Host/Components/InstanceManager.cs +++ b/src/Tgstation.Server.Host/Components/InstanceManager.cs @@ -208,10 +208,11 @@ namespace Tgstation.Server.Host.Components /// public async Task StopAsync(CancellationToken cancellationToken) { + await jobManager.StopAsync(cancellationToken).ConfigureAwait(false); + using (cancellationToken.Register(() => shutdownCancellationTokenSource.Cancel())) await Task.WhenAll(shutdownTasks).ConfigureAwait(false); await Task.WhenAll(instances.Select(x => x.Value.StopAsync(cancellationToken))).ConfigureAwait(false); - await jobManager.StopAsync(cancellationToken).ConfigureAwait(false); } } }