diff --git a/roomserver/internal/input/input.go b/roomserver/internal/input/input.go
index 857dbe1c0..acffde5d6 100644
--- a/roomserver/internal/input/input.go
+++ b/roomserver/internal/input/input.go
@@ -119,7 +119,11 @@ func (r *Inputer) InputRoomEvents(
 				} else {
 					hooks.Run(hooks.KindNewEventPersisted, inputRoomEvent.Event)
 				}
-				responses <- err
+				select {
+				case <-ctx.Done():
+				default:
+					responses <- err
+				}
 			})
 		}
 		for i := 0; i < len(request.InputRoomEvents); i++ {