diff --git a/src/core/settings.c b/src/core/settings.c
index 9b5bc054..1b19c8f6 100644
--- a/src/core/settings.c
+++ b/src/core/settings.c
@@ -1052,8 +1052,8 @@ int storef_setting ( struct settings *settings, struct setting *setting,
 	int check_len;
 	int rc;
 
-	/* NULL value implies deletion */
-	if ( ! value )
+	/* NULL value or empty string implies deletion */
+	if ( ( ! value ) || ( ! value[0] ) )
 		return delete_setting ( settings, setting );
 
 	/* Parse formatted value */