diff --git a/win32ss/user/winsrv/usersrv/shutdown.c b/win32ss/user/winsrv/usersrv/shutdown.c
index 5c2f464f846..7238b21ab80 100644
--- a/win32ss/user/winsrv/usersrv/shutdown.c
+++ b/win32ss/user/winsrv/usersrv/shutdown.c
@@ -796,6 +796,8 @@ UserClientShutdown(IN PCSR_PROCESS CsrProcess,
 #endif
     NtTerminateProcess(CsrProcess->ProcessHandle, 0);
 
+    WaitForSingleObject(CsrProcess->ProcessHandle, ShutdownSettings.ProcessTerminateTimeout);
+
     /* We are done */
     CsrDereferenceProcess(CsrProcess);
     return CsrShutdownCsrProcess;