diff --git a/config.c b/config.c
index 5ae8614e78628b..a11bb85da303a7 100644
--- a/config.c
+++ b/config.c
@@ -615,8 +615,6 @@ static int config_parse_pair(const char *key, const char *value,
 
 	if (!strlen(key))
 		return error(_("empty config key"));
-	if (!value || !strlen(value))
-		return error(_("empty config value"));
 	if (git_config_parse_key(key, &canonical_name, NULL))
 		return -1;
 
diff --git a/trace2.c b/trace2.c
index f894532d05331c..5df43478b8fb22 100644
--- a/trace2.c
+++ b/trace2.c
@@ -759,7 +759,7 @@ void trace2_def_param_fl(const char *file, int line, const char *param,
 	int j;
 	const char *redacted;
 
-	if (!trace2_enabled)
+	if (!trace2_enabled || !value)
 		return;
 
 	redacted = redact_arg(value);