diff --git a/packages/util/src/events.ts b/packages/util/src/events.ts
index c45a78e8..4d7b637e 100644
--- a/packages/util/src/events.ts
+++ b/packages/util/src/events.ts
@@ -125,12 +125,12 @@ export class EventWatcher {
 
     // Perform checks before starting historical block processing
     if (
+      // Check if any block handler exists in subgraph config
+      !this._indexer.graphWatcher?.blockHandlerExists &&
       // Check if useBlockRanges is enabled for historical blocks processing
       this._config.jobQueue.useBlockRanges &&
       // Check if starting block for watcher is before latest canonical block
-      startBlockNumber < latestCanonicalBlockNumber &&
-      // Check if any block handler exists in subgraph config
-      !this._indexer.graphWatcher?.blockHandlerExists
+      startBlockNumber < latestCanonicalBlockNumber
     ) {
       await this.startHistoricalBlockProcessing(startBlockNumber, latestCanonicalBlockNumber);
 
diff --git a/packages/util/src/types.ts b/packages/util/src/types.ts
index 7422fc65..78888491 100644
--- a/packages/util/src/types.ts
+++ b/packages/util/src/types.ts
@@ -289,6 +289,7 @@ export interface GraphDatabaseInterface {
 
 export interface GraphWatcherInterface {
   readonly blockHandlerExists: boolean;
+  readonly eventHandlerExists: boolean;
   init (): Promise<void>;
   setIndexer (indexer: IndexerInterface): void;
 }