diff --git a/coderd/provisionerdserver/provisionerdserver.go b/coderd/provisionerdserver/provisionerdserver.go
index 38038df49dd90..6465eab1d9fe9 100644
--- a/coderd/provisionerdserver/provisionerdserver.go
+++ b/coderd/provisionerdserver/provisionerdserver.go
@@ -1206,6 +1206,13 @@ func (s *server) CompleteJob(ctx context.Context, completed *proto.CompletedJob)
 						case <-wait:
 							// Wait for the next potential timeout to occur.
 							if err := s.Pubsub.Publish(codersdk.WorkspaceNotifyChannel(workspaceBuild.WorkspaceID), []byte{}); err != nil {
+								if s.lifecycleCtx.Err() != nil {
+									// If the server is shutting down, we don't want to log this error, nor wait around.
+									s.Logger.Debug(ctx, "stopping notifications due to server shutdown",
+										slog.F("workspace_build_id", workspaceBuild.ID),
+									)
+									return
+								}
 								s.Logger.Error(ctx, "workspace notification after agent timeout failed",
 									slog.F("workspace_build_id", workspaceBuild.ID),
 									slog.Error(err),