diff --git a/crates/dojo-world/src/manifest/mod.rs b/crates/dojo-world/src/manifest/mod.rs
index 602ecdc96b..9497a582ab 100644
--- a/crates/dojo-world/src/manifest/mod.rs
+++ b/crates/dojo-world/src/manifest/mod.rs
@@ -551,9 +551,14 @@ async fn get_events<P: Provider + Send + Sync>(
     loop {
         let res =
             provider.get_events(filter.clone(), continuation_token, DEFAULT_CHUNK_SIZE).await?;
-
         continuation_token = res.continuation_token;
-        events.extend(res.events);
+
+        // stop when there are no more events being returned
+        if res.events.is_empty() {
+            break;
+        } else {
+            events.extend(res.events);
+        }
 
         if continuation_token.is_none() {
             break;