diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c
index ac92340af5..b37023c46e 100644
--- a/src/backend/executor/execMain.c
+++ b/src/backend/executor/execMain.c
@@ -2996,4 +2996,6 @@ EvalPlanQualEnd(EPQState *epqstate)
        epqstate->recheckestate = NULL;
        epqstate->recheckplanstate = NULL;
        epqstate->origslot = NULL;
+       epqstate->relsubs_done = NULL;
+       epqstate->relsubs_rowmark = NULL;
 }