diff --git a/src/Tgstation.Server.Host/Components/Watchdog/Watchdog.cs b/src/Tgstation.Server.Host/Components/Watchdog/Watchdog.cs
index df759f6de9..2d7776d7f2 100644
--- a/src/Tgstation.Server.Host/Components/Watchdog/Watchdog.cs
+++ b/src/Tgstation.Server.Host/Components/Watchdog/Watchdog.cs
@@ -549,9 +549,10 @@ namespace Tgstation.Server.Host.Components.Watchdog
 							}
 							else
 								moreActivationsToProcess = false;
+							
+							await HandlerMonitorWakeup(activationReason, monitorState, cancellationToken).ConfigureAwait(false);
 						}
 
-						await HandlerMonitorWakeup(activationReason, monitorState, cancellationToken).ConfigureAwait(false);
 						//writeback alphaServer and bravoServer
 						alphaServer = AlphaIsActive ? monitorState.ActiveServer : monitorState.InactiveServer;
 						bravoServer = AlphaIsActive ? monitorState.ActiveServer : monitorState.InactiveServer;
@@ -575,7 +576,7 @@ namespace Tgstation.Server.Host.Components.Watchdog
 								monitorState = new MonitorState();  //clean the slate
 						}
 
-							await chatTask.ConfigureAwait(false);
+						await chatTask.ConfigureAwait(false);
 						if(!Running)
 						{
 							logger.LogWarning("Failed to automatically restart the watchdog! Alpha: {0}; Bravo: {1}", result.Alpha.ToString(), result.Bravo.ToString());
diff --git a/v4_prototype_TODO.txt b/v4_prototype_TODO.txt
index 572d75b123..641f358e0e 100644
--- a/v4_prototype_TODO.txt
+++ b/v4_prototype_TODO.txt
@@ -1,3 +1,6 @@
 Verify the byond cache folder location on linux
 
 Test watchdog
+
+Only show user name and ID when serializing to API
+In fact remove IApiConvertable<> altogether, it's not required by anything
\ No newline at end of file