diff --git a/src/backend/commands/functioncmds.c b/src/backend/commands/functioncmds.c
index 3c74873eeb..f04304c244 100644
--- a/src/backend/commands/functioncmds.c
+++ b/src/backend/commands/functioncmds.c
@@ -624,10 +624,7 @@ update_proconfig_value(ArrayType *a, List *set_items)
 		{
 			char	   *valuestr = ExtractSetVariableArgs(sstmt);
 
-			if (valuestr)
-				a = GUCArrayAdd(a, sstmt->name, valuestr);
-			else				/* RESET */
-				a = GUCArrayDelete(a, sstmt->name);
+			a = GUCArrayAdd(a, sstmt->name, valuestr);
 		}
 	}
 
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index 44dfa92722..200acd694b 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -9709,7 +9709,13 @@ ProcessGUCArray(ArrayType *array,
 			continue;
 		}
 
-		(void) set_config_option(name, value,
+		if (value && strcmp(value, "default") == 0)
+			(void) set_config_option(name, NULL,
+									 context, source,
+									 action, true, 0, false);
+
+		else
+			(void) set_config_option(name, value,
 								 context, source,
 								 action, true, 0, false);
 
@@ -9734,7 +9740,6 @@ GUCArrayAdd(ArrayType *array, const char *name, const char *value)
 	ArrayType  *a;
 
 	Assert(name);
-	Assert(value);
 
 	/* test if the option is valid and we're allowed to set it */
 	(void) validate_option_array_item(name, value, false);
@@ -9745,7 +9750,11 @@ GUCArrayAdd(ArrayType *array, const char *name, const char *value)
 		name = record->name;
 
 	/* build new item for array */
-	newval = psprintf("%s=%s", name, value);
+	if (value)
+		newval = psprintf("%s=%s", name, value);
+	else
+		newval = psprintf("%s=default", name);
+		
 	datum = CStringGetTextDatum(newval);
 
 	if (array)
