diff --git a/src/backend/executor/execParallel.c b/src/backend/executor/execParallel.c
index 53c5254be13..25dd82ece74 100644
--- a/src/backend/executor/execParallel.c
+++ b/src/backend/executor/execParallel.c
@@ -319,7 +319,7 @@ EstimateParamExecSpace(EState *estate, Bitmapset *params)
  * parameter array) and then the datum as serialized by datumSerialize().
  */
 static dsa_pointer
-SerializeParamExecParams(EState *estate, Bitmapset *params)
+SerializeParamExecParams(EState *estate, Bitmapset *params, dsa_area *area)
 {
 	Size		size;
 	int			nparams;
@@ -330,8 +330,8 @@ SerializeParamExecParams(EState *estate, Bitmapset *params)
 
 	/* Allocate enough space for the current parameter values. */
 	size = EstimateParamExecSpace(estate, params);
-	handle = dsa_allocate(estate->es_query_dsa, size);
-	start_address = dsa_get_address(estate->es_query_dsa, handle);
+	handle = dsa_allocate(area, size);
+	start_address = dsa_get_address(area, handle);
 
 	/* First write the number of parameters as a 4-byte integer. */
 	nparams = bms_num_members(params);
@@ -716,12 +716,6 @@ ExecInitParallelPlan(PlanState *planstate, EState *estate,
 										LWTRANCHE_PARALLEL_QUERY_DSA,
 										pcxt->seg);
 
-		/*
-		 * Make the area available to executor nodes running in the leader.
-		 * See also ParallelQueryMain which makes it available to workers.
-		 */
-		estate->es_query_dsa = pei->area;
-
 		/*
 		 * Serialize parameters, if any, using DSA storage.  We don't dare use
 		 * the main parallel query DSM for this because we might relaunch
@@ -730,7 +724,8 @@ ExecInitParallelPlan(PlanState *planstate, EState *estate,
 		 */
 		if (!bms_is_empty(sendParams))
 		{
-			pei->param_exec = SerializeParamExecParams(estate, sendParams);
+			pei->param_exec = SerializeParamExecParams(estate, sendParams,
+													   pei->area);
 			fpes->param_exec = pei->param_exec;
 		}
 	}
@@ -743,7 +738,9 @@ ExecInitParallelPlan(PlanState *planstate, EState *estate,
 	d.pcxt = pcxt;
 	d.instrumentation = instrumentation;
 	d.nnodes = 0;
+	estate->es_query_dsa = pei->area;
 	ExecParallelInitializeDSM(planstate, &d);
+	estate->es_query_dsa = NULL;
 
 	/*
 	 * Make sure that the world hasn't shifted under our feet.  This could
@@ -812,19 +809,22 @@ ExecParallelReinitialize(PlanState *planstate,
 	/* Free any serialized parameters from the last round. */
 	if (DsaPointerIsValid(fpes->param_exec))
 	{
-		dsa_free(estate->es_query_dsa, fpes->param_exec);
+		dsa_free(pei->area, fpes->param_exec);
 		fpes->param_exec = InvalidDsaPointer;
 	}
 
 	/* Serialize current parameter values if required. */
 	if (!bms_is_empty(sendParams))
 	{
-		pei->param_exec = SerializeParamExecParams(estate, sendParams);
+		pei->param_exec = SerializeParamExecParams(estate, sendParams,
+												   pei->area);
 		fpes->param_exec = pei->param_exec;
 	}
 
 	/* Traverse plan tree and let each child node reset associated state. */
+	estate->es_query_dsa = pei->area;
 	ExecParallelReInitializeDSM(planstate, pei->pcxt);
+	estate->es_query_dsa = NULL;
 }
 
 /*
diff --git a/src/backend/executor/nodeGather.c b/src/backend/executor/nodeGather.c
index 212612b5351..42315d727ac 100644
--- a/src/backend/executor/nodeGather.c
+++ b/src/backend/executor/nodeGather.c
@@ -287,7 +287,11 @@ gather_getnext(GatherState *gatherstate)
 
 		if (gatherstate->need_to_scan_locally)
 		{
+			EState *estate = gatherstate->ps.state;
+
+			estate->es_query_dsa = gatherstate->pei->area;
 			outerTupleSlot = ExecProcNode(outerPlan);
+			estate->es_query_dsa = NULL;
 
 			if (!TupIsNull(outerTupleSlot))
 				return outerTupleSlot;
diff --git a/src/backend/executor/nodeGatherMerge.c b/src/backend/executor/nodeGatherMerge.c
index 166f2064ff7..a40635ffe14 100644
--- a/src/backend/executor/nodeGatherMerge.c
+++ b/src/backend/executor/nodeGatherMerge.c
@@ -637,8 +637,11 @@ gather_merge_readnext(GatherMergeState *gm_state, int reader, bool nowait)
 		{
 			PlanState  *outerPlan = outerPlanState(gm_state);
 			TupleTableSlot *outerTupleSlot;
+			EState *estate = gm_state->ps.state;
 
+			estate->es_query_dsa = gm_state->pei->area;
 			outerTupleSlot = ExecProcNode(outerPlan);
+			estate->es_query_dsa = NULL;
 
 			if (!TupIsNull(outerTupleSlot))
 			{