diff --git a/reactos/lib/advapi32/reg/reg.c b/reactos/lib/advapi32/reg/reg.c
index b5b363410dc..7ff80133da7 100644
--- a/reactos/lib/advapi32/reg/reg.c
+++ b/reactos/lib/advapi32/reg/reg.c
@@ -1293,11 +1293,11 @@ RegEnumValueA (HKEY hKey,
 	}
 	else
 	{
-		if (lpData)
-		{
-			IsStringType = (ValueInfo->Full.Type ==	REG_SZ)	||
+		IsStringType = (ValueInfo->Full.Type ==	REG_SZ)	||
 				(ValueInfo->Full.Type == REG_MULTI_SZ) ||
 				(ValueInfo->Full.Type == REG_EXPAND_SZ);
+                if (lpData)
+		{
 			if (ValueInfo->Full.NameLength > NameLength	||
 				(!IsStringType && ValueInfo->Full.DataLength > *lpcbData) ||
 				ValueInfo->Full.DataLength > DataLength)