diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index 23ebac83d6e..6c73d32ad2e 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -1944,6 +1944,9 @@ get_database_list(void)
 
 	CommitTransactionCommand();
 
+	/* Be sure to restore caller's memory context */
+	MemoryContextSwitchTo(resultcxt);
+
 	return dblist;
 }