diff --git a/reactos/base/system/smss/initenv.c b/reactos/base/system/smss/initenv.c
index 7483f206970..013ce2bc17b 100644
--- a/reactos/base/system/smss/initenv.c
+++ b/reactos/base/system/smss/initenv.c
@@ -71,12 +71,11 @@ SmpEnvironmentQueryRoutine(IN PWSTR ValueName,
                            IN PVOID EntryContext)
 {
     DPRINT("ValueName '%S'  Type %lu  Length %lu\n", ValueName, ValueType, ValueLength);
-    DPRINT("ValueData '%S'\n", (PWSTR)ValueData);
 
-    if (ValueType != REG_SZ)
+    if (ValueType != REG_SZ && ValueType != REG_EXPAND_SZ)
         return STATUS_SUCCESS;
 
-
+    DPRINT("ValueData '%S'\n", (PWSTR)ValueData);
     return SmpSetEnvironmentVariable(Context,ValueName,ValueData);
 }