diff --git a/roomserver/api/api_trace.go b/roomserver/api/api_trace.go
index e3b3825ca..b7accb9a8 100644
--- a/roomserver/api/api_trace.go
+++ b/roomserver/api/api_trace.go
@@ -26,7 +26,6 @@ func (t *RoomserverInternalAPITrace) InputRoomEvents(
 ) {
 	t.Impl.InputRoomEvents(ctx, req, res)
 	util.GetLogger(ctx).Infof("InputRoomEvents req=%+v res=%+v", js(req), js(res))
-	return
 }
 
 func (t *RoomserverInternalAPITrace) PerformInvite(
diff --git a/roomserver/internal/input/input.go b/roomserver/internal/input/input.go
index 8809acd8e..d340ac218 100644
--- a/roomserver/internal/input/input.go
+++ b/roomserver/internal/input/input.go
@@ -162,5 +162,4 @@ func (r *Inputer) InputRoomEvents(
 			return
 		}
 	}
-	return
 }