diff --git a/syncapi/streams/stream_presence.go b/syncapi/streams/stream_presence.go
index 432486f8d..05dbb532e 100644
--- a/syncapi/streams/stream_presence.go
+++ b/syncapi/streams/stream_presence.go
@@ -72,6 +72,7 @@ func (p *PresenceStreamProvider) IncrementalSync(
 			req.Log.WithError(err).Error("unable to refresh notifier lists")
 			return from
 		}
+	NewlyJoinedLoop:
 		for _, roomID := range newlyJoined {
 			roomUsers := p.notifier.JoinedUsers(roomID)
 			for i := range roomUsers {
@@ -86,6 +87,9 @@ func (p *PresenceStreamProvider) IncrementalSync(
 					req.Log.WithError(err).Error("unable to query presence for user")
 					return from
 				}
+				if len(presences) > req.Filter.Presence.Limit {
+					break NewlyJoinedLoop
+				}
 			}
 		}
 	}