diff --git a/src/Tgstation.Server.Host/Components/Instance.cs b/src/Tgstation.Server.Host/Components/Instance.cs
index 687eb2c246..5ebff412e9 100644
--- a/src/Tgstation.Server.Host/Components/Instance.cs
+++ b/src/Tgstation.Server.Host/Components/Instance.cs
@@ -591,7 +591,17 @@ namespace Tgstation.Server.Host.Components
 		}
 
 		/// <inheritdoc />
-		public Task StopAsync(CancellationToken cancellationToken) => Task.WhenAll(SetAutoUpdateInterval(0), Configuration.StopAsync(cancellationToken), ByondManager.StopAsync(cancellationToken), Watchdog.StopAsync(cancellationToken), Chat.StopAsync(cancellationToken), compileJobConsumer.StopAsync(cancellationToken));
+		public async Task StopAsync(CancellationToken cancellationToken)
+		{
+			await Watchdog.StopAsync(cancellationToken).ConfigureAwait(false);
+			await SetAutoUpdateInterval(0).ConfigureAwait(false);
+			await Task.WhenAll(
+				Configuration.StopAsync(cancellationToken),
+				ByondManager.StopAsync(cancellationToken),
+				Chat.StopAsync(cancellationToken),
+				compileJobConsumer.StopAsync(cancellationToken))
+				.ConfigureAwait(false);
+		}
 
 		/// <inheritdoc />
 		public async Task SetAutoUpdateInterval(uint newInterval)