diff --git a/xmpp/handlers.go b/xmpp/handlers.go
index 0d0a6b4..9811428 100644
--- a/xmpp/handlers.go
+++ b/xmpp/handlers.go
@@ -2425,6 +2425,7 @@ func handleSetQueryMAM2(s xmpp.Sender, iq *stanza.IQ, query *extensions.MAM2Quer
 		// don't allow to fetch far beyond the quota
 		if !endTime.IsZero() && endTime.Before(quotaTs) {
 			beyond = true
+			complete = true
 		}
 		if (!startTime.IsZero() && startTime.Before(quotaTs)) || startTime.IsZero() {
 			startTime = quotaTs
@@ -2448,6 +2449,7 @@ func handleSetQueryMAM2(s xmpp.Sender, iq *stanza.IQ, query *extensions.MAM2Quer
 					overallyLastMessageId = lastMessageId
 				} else {
 					beyond = true
+					complete = true
 				}
 			} else {
 				newestMessage, newestMessageErr := session.GetPreviousMessage(toID, 0)