diff --git a/src/backend/commands/variable.c b/src/backend/commands/variable.c
index 61eae295fa8..f92d72b5b7e 100644
--- a/src/backend/commands/variable.c
+++ b/src/backend/commands/variable.c
@@ -1082,6 +1082,8 @@ check_application_name(char **newval, void **extra, GucSource source)
 		return false;
 	}
 
+	guc_free(*newval);
+
 	pfree(clean);
 	*newval = ret;
 	return true;
@@ -1118,6 +1120,8 @@ check_cluster_name(char **newval, void **extra, GucSource source)
 		return false;
 	}
 
+	guc_free(*newval);
+
 	pfree(clean);
 	*newval = ret;
 	return true;