diff --git a/reactos/subsystems/win32/win32k/main/dllmain.c b/reactos/subsystems/win32/win32k/main/dllmain.c
index 5439908416b..5bc3a528849 100644
--- a/reactos/subsystems/win32/win32k/main/dllmain.c
+++ b/reactos/subsystems/win32/win32k/main/dllmain.c
@@ -275,7 +275,10 @@ Win32kThreadCallback(struct _ETHREAD *Thread,
       Win32Thread->ppi = PsGetCurrentProcessWin32Process();
       pTeb = NtCurrentTeb();
       if (pTeb)
+      {
           Win32Thread->pClientInfo = (PCLIENTINFO)pTeb->Win32ClientInfo;
+          Win32Thread->pClientInfo->pClientThreadInfo = NULL;
+      }
       Win32Thread->MessageQueue = MsqCreateMessageQueue(Thread);
       Win32Thread->KeyboardLayout = W32kGetDefaultKeyLayout();
       if (Win32Thread->ThreadInfo)
@@ -283,8 +286,6 @@ Win32kThreadCallback(struct _ETHREAD *Thread,
           Win32Thread->ThreadInfo->ClientThreadInfo.dwcPumpHook = 0;
           Win32Thread->pClientInfo->pClientThreadInfo = &Win32Thread->ThreadInfo->ClientThreadInfo;
       }
-      else
-         Win32Thread->pClientInfo->pClientThreadInfo = NULL;
     }
   else
     {