diff --git a/internal/httputil/httpapi.go b/internal/httputil/httpapi.go
index 1fbd77da9..1a37a1eec 100644
--- a/internal/httputil/httpapi.go
+++ b/internal/httputil/httpapi.go
@@ -53,12 +53,13 @@ func MakeAuthAPI(
 	f func(*http.Request, *userapi.Device) util.JSONResponse,
 ) http.Handler {
 	h := func(req *http.Request) util.JSONResponse {
+		logger := util.GetLogger(req.Context())
 		device, err := auth.VerifyUserFromRequest(req, userAPI)
 		if err != nil {
+			logger.Debugf("VerifyUserFromRequest %s -> HTTP %d", req.RemoteAddr, err.Code)
 			return *err
 		}
 		// add the user ID to the logger
-		logger := util.GetLogger((req.Context()))
 		logger = logger.WithField("user_id", device.UserID)
 		req = req.WithContext(util.ContextWithLogger(req.Context(), logger))
 		// add the user to Sentry, if enabled
diff --git a/roomserver/internal/input/input.go b/roomserver/internal/input/input.go
index e0ddd07cf..e6f325b47 100644
--- a/roomserver/internal/input/input.go
+++ b/roomserver/internal/input/input.go
@@ -25,7 +25,6 @@ import (
 	"github.com/Arceliar/phony"
 	"github.com/getsentry/sentry-go"
 	fedapi "github.com/matrix-org/dendrite/federationapi/api"
-	"github.com/matrix-org/dendrite/internal/hooks"
 	"github.com/matrix-org/dendrite/roomserver/acls"
 	"github.com/matrix-org/dendrite/roomserver/api"
 	"github.com/matrix-org/dendrite/roomserver/internal/query"
@@ -105,8 +104,6 @@ func (r *Inputer) Start() error {
 					if !errors.Is(err, context.DeadlineExceeded) && !errors.Is(err, context.Canceled) {
 						sentry.CaptureException(err)
 					}
-				} else {
-					go hooks.Run(hooks.KindNewEventPersisted, inputRoomEvent.Event)
 				}
 				_ = msg.Ack()
 			})
@@ -176,8 +173,6 @@ func (r *Inputer) InputRoomEvents(
 					if !errors.Is(err, context.DeadlineExceeded) && !errors.Is(err, context.Canceled) {
 						sentry.CaptureException(err)
 					}
-				} else {
-					go hooks.Run(hooks.KindNewEventPersisted, inputRoomEvent.Event)
 				}
 				select {
 				case <-ctx.Done():
diff --git a/roomserver/internal/input/input_events.go b/roomserver/internal/input/input_events.go
index 5f9115223..334421400 100644
--- a/roomserver/internal/input/input_events.go
+++ b/roomserver/internal/input/input_events.go
@@ -25,6 +25,7 @@ import (
 	fedapi "github.com/matrix-org/dendrite/federationapi/api"
 	"github.com/matrix-org/dendrite/internal"
 	"github.com/matrix-org/dendrite/internal/eventutil"
+	"github.com/matrix-org/dendrite/internal/hooks"
 	"github.com/matrix-org/dendrite/roomserver/api"
 	"github.com/matrix-org/dendrite/roomserver/internal/helpers"
 	"github.com/matrix-org/dendrite/roomserver/state"
@@ -321,7 +322,9 @@ func (r *Inputer) processRoomEvent(
 		}
 	}
 
-	// Update the extremities of the event graph for the room
+	// Everything was OK — the latest events updater didn't error and
+	// we've sent output events. Finally, generate a hook call.
+	hooks.Run(hooks.KindNewEventPersisted, headered)
 	return nil
 }