diff --git a/src/backend/distributed/executor/citus_custom_scan.c b/src/backend/distributed/executor/citus_custom_scan.c
index 74fc1f11a..d2e5cd51f 100644
--- a/src/backend/distributed/executor/citus_custom_scan.c
+++ b/src/backend/distributed/executor/citus_custom_scan.c
@@ -433,6 +433,7 @@ CacheLocalPlanForTask(Task *task, DistributedPlan *originalDistributedPlan)
 	if (rangeTableEntry->relid == InvalidOid)
 	{
 		pfree(shardQuery);
+		MemoryContextSwitchTo(oldContext);
 		return;
 	}