diff --git a/src/Tgstation.Server.Host/Components/Watchdog/WatchdogBase.cs b/src/Tgstation.Server.Host/Components/Watchdog/WatchdogBase.cs
index 4d2db18c2d..d3067f29b7 100644
--- a/src/Tgstation.Server.Host/Components/Watchdog/WatchdogBase.cs
+++ b/src/Tgstation.Server.Host/Components/Watchdog/WatchdogBase.cs
@@ -904,14 +904,9 @@ namespace Tgstation.Server.Host.Components.Watchdog
 		/// <inheritdoc />
 		public async Task StopAsync(CancellationToken cancellationToken)
 		{
-			if (releaseServers)
-			{
-				await StopMonitor().ConfigureAwait(false);
-				if (releasedReattachInformation != null)
-					await reattachInfoHandler.Save(releasedReattachInformation, cancellationToken).ConfigureAwait(false);
-			}
-
 			await TerminateNoLock(false, !releaseServers, cancellationToken).ConfigureAwait(false);
+			if (releasedReattachInformation != null)
+				await reattachInfoHandler.Save(releasedReattachInformation, cancellationToken).ConfigureAwait(false);
 		}
 
 		/// <inheritdoc />