diff --git a/src/backend/postmaster/pgarch.c b/src/backend/postmaster/pgarch.c
index 35af55cd678..b308f5ff6e1 100644
--- a/src/backend/postmaster/pgarch.c
+++ b/src/backend/postmaster/pgarch.c
@@ -566,6 +566,7 @@ pgarch_archiveXlog(char *xlog)
 		 */
 		disable_all_timeouts(false);
 		LWLockReleaseAll();
+		CustomErrorCleanup();
 		ConditionVariableCancelSleep();
 		pgstat_report_wait_end();
 		ReleaseAuxProcessResources(false);
diff --git a/src/backend/postmaster/walsummarizer.c b/src/backend/postmaster/walsummarizer.c
index c1bf4a70dd1..dfc2c455d5e 100644
--- a/src/backend/postmaster/walsummarizer.c
+++ b/src/backend/postmaster/walsummarizer.c
@@ -286,6 +286,7 @@ WalSummarizerMain(char *startup_data, size_t startup_data_len)
 
 		/* Release resources we might have acquired. */
 		LWLockReleaseAll();
+		CustomErrorCleanup();
 		ConditionVariableCancelSleep();
 		pgstat_report_wait_end();
 		ReleaseAuxProcessResources(false);