diff --git a/winpr/libwinpr/utils/cmdline.c b/winpr/libwinpr/utils/cmdline.c
index 3b1d6dfb9..d545a7f47 100644
--- a/winpr/libwinpr/utils/cmdline.c
+++ b/winpr/libwinpr/utils/cmdline.c
@@ -490,7 +490,7 @@ char** CommandLineParseCommaSeparatedValuesEx(const char* name, const char* list
 
 	*count = 0;
 
-	if (!list)
+	if (!list || strlen(list) == 0)
 	{
 		if (name)
 		{