diff --git a/src/TournamentDataProvider/StartGGDataProvider.py b/src/TournamentDataProvider/StartGGDataProvider.py
index fe3a81671..4c42cfe12 100644
--- a/src/TournamentDataProvider/StartGGDataProvider.py
+++ b/src/TournamentDataProvider/StartGGDataProvider.py
@@ -424,7 +424,7 @@ def GetMatches(self, getFinished=False, progress_callback=None, cancel_event=Non
 
             logger.info("Fetching sets")
 
-            while page <= totalPages and not cancel_event.is_set():
+            while page <= totalPages and (cancel_event is None or not cancel_event.is_set()):
                 data = self.QueryRequests(
                     "https://www.start.gg/api/-/gql",
                     type=requests.post,