diff --git a/reactos/dll/win32/kernel32/client/dllmain.c b/reactos/dll/win32/kernel32/client/dllmain.c
index b090969bc61..06462264939 100644
--- a/reactos/dll/win32/kernel32/client/dllmain.c
+++ b/reactos/dll/win32/kernel32/client/dllmain.c
@@ -264,7 +264,7 @@ BasepFakeStaticServerData(VOID)
     UNICODE_STRING SystemRootString;
     UNICODE_STRING UnexpandedSystemRootString = RTL_CONSTANT_STRING(L"%SystemRoot%");
     UNICODE_STRING BaseSrvCSDString;
-    RTL_QUERY_REGISTRY_TABLE BaseServerRegistryConfigurationTable[] =
+    RTL_QUERY_REGISTRY_TABLE BaseServerRegistryConfigurationTable[2] =
     {
         {
             NULL,
@@ -322,6 +322,9 @@ BasepFakeStaticServerData(VOID)
      */ 
     BaseStaticServerData->CSDNumber = 0;
     BaseStaticServerData->RCNumber = 0;
+    
+    /* Initialize the CSD string */
+    RtlInitEmptyUnicodeString(&BaseSrvCSDString, Buffer, sizeof(Buffer));
 
     Status = RtlQueryRegistryValues(RTL_REGISTRY_WINDOWS_NT,
                                     L"",