diff --git a/coderd/database/pubsub/watchdog.go b/coderd/database/pubsub/watchdog.go
index 2b8d929fa7e38..687129fc5bcc2 100644
--- a/coderd/database/pubsub/watchdog.go
+++ b/coderd/database/pubsub/watchdog.go
@@ -103,6 +103,8 @@ func (w *Watchdog) publishLoop() {
 
 func (w *Watchdog) subscribeMonitor() {
 	defer w.wg.Done()
+	tmr := w.clock.Timer(periodTimeout)
+	defer tmr.Stop()
 	beats := make(chan struct{})
 	unsub, err := w.ps.Subscribe(EventPubsubWatchdog, func(context.Context, []byte) {
 		w.logger.Debug(w.ctx, "got heartbeat for pubsub watchdog")
@@ -117,8 +119,6 @@ func (w *Watchdog) subscribeMonitor() {
 		return
 	}
 	defer unsub()
-	tmr := w.clock.Timer(periodTimeout)
-	defer tmr.Stop()
 	for {
 		select {
 		case <-w.ctx.Done():