diff --git a/packages/code-analyzer-flow-engine/FlowScanner/queries/optional_query.py b/packages/code-analyzer-flow-engine/FlowScanner/queries/optional_query.py
index 8c5eab73..61b49cc1 100644
--- a/packages/code-analyzer-flow-engine/FlowScanner/queries/optional_query.py
+++ b/packages/code-analyzer-flow-engine/FlowScanner/queries/optional_query.py
@@ -233,9 +233,6 @@ class MissingFaultHandler(LexicalQuery):
     fault_tags = ['recordCreates', 'recordUpdates', 'recordDeletes',
                        'actionCalls', 'subflows']
 
-    def __init__(self):
-        self.root = None
-
     @classmethod
     def get_query_description(cls) -> QueryDescription:
         return QueryDescription(query_id=cls.query_id,
@@ -253,11 +250,7 @@ def when_to_run(self) -> list[QueryAction]:
 
     def execute(self, parser: FlowParser = None, **kwargs) -> list[QueryResult] | None:
         accum = []
-        if self.root is None:
-            root = parser.get_root()
-            self.root = root
-        else:
-            root = self.root
+        root = parser.get_root()
 
         for tag_ in self.fault_tags:
             elems = parse_utils.get_by_tag(root, tag_)
diff --git a/packages/code-analyzer-flow-engine/package.json b/packages/code-analyzer-flow-engine/package.json
index 94cf8c2c..30dede3f 100644
--- a/packages/code-analyzer-flow-engine/package.json
+++ b/packages/code-analyzer-flow-engine/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@salesforce/code-analyzer-flow-engine",
   "description": "Plugin package that adds 'Flow Scanner' as an engine into Salesforce Code Analyzer",
-  "version": "0.38.0",
+  "version": "0.39.0-SNAPSHOT",
   "author": "The Salesforce Code Analyzer Team",
   "license": "BSD-3-Clause",
   "homepage": "https://developer.salesforce.com/docs/platform/salesforce-code-analyzer/overview",
diff --git a/packages/code-analyzer-flow-engine/test/engine.test.ts b/packages/code-analyzer-flow-engine/test/engine.test.ts
index ddbc08e4..06aaf7e3 100644
--- a/packages/code-analyzer-flow-engine/test/engine.test.ts
+++ b/packages/code-analyzer-flow-engine/test/engine.test.ts
@@ -125,7 +125,7 @@ describe('Tests for the FlowScannerEngine', () => {
             }, {});
             expect(countsPerRule).toEqual({
                 MissingDescription: 56,
-                MissingFaultHandler: 9,
+                MissingFaultHandler: 8,
                 PreventPassingUserDataIntoElementWithoutSharing: 5,
                 PreventPassingUserDataIntoElementWithSharing: 2
             });