diff --git a/matrix/acquire.cc b/matrix/acquire.cc
index ebb2d8113..bb43e7081 100644
--- a/matrix/acquire.cc
+++ b/matrix/acquire.cc
@@ -617,12 +617,11 @@ try
 	fetch::opts fopts;
 	fopts.room_id = opts.room.room_id;
 	fopts.event_id = event_id;
-
 	fopts.backfill_limit = limit;
 	fopts.op =
-		limit > 1?
-		fetch::op::backfill:
-		fetch::op::event;
+		(limit > 1 || hint)?
+			fetch::op::backfill:
+			fetch::op::event;
 
 	fopts.hint = hint;
 	fopts.attempt_limit =