diff --git a/src/cfg/cfg-traversal.h b/src/cfg/cfg-traversal.h
index 9c68ae863f3..64877c58cfc 100644
--- a/src/cfg/cfg-traversal.h
+++ b/src/cfg/cfg-traversal.h
@@ -548,6 +548,8 @@ struct CFGWalker : public PostWalker<SubType, VisitorType> {
   void doWalkFunction(Function* func) {
     basicBlocks.clear();
     debugIds.clear();
+    exit = nullptr;
+    hasSyntheticExit = false;
 
     startBasicBlock();
     entry = currBasicBlock;