diff --git a/reactos/subsys/csrss/api/wapi.c b/reactos/subsys/csrss/api/wapi.c
index d740d01ba5f..5326472b5c6 100644
--- a/reactos/subsys/csrss/api/wapi.c
+++ b/reactos/subsys/csrss/api/wapi.c
@@ -113,7 +113,6 @@ STDCALL
 ClientConnectionThread(HANDLE ServerPort)
 {
     NTSTATUS Status;
-    LPC_MAX_MESSAGE LpcReply;
     LPC_MAX_MESSAGE LpcRequest;
     PCSR_API_MESSAGE Request;
     PCSR_API_MESSAGE Reply;
@@ -121,6 +120,9 @@ ClientConnectionThread(HANDLE ServerPort)
   
     DPRINT("CSR: %s called", __FUNCTION__);
 
+    /* Reply must be NULL at the first call to NtReplyWaitReceivePort */
+    Reply = NULL; 
+
     /* Loop and reply/wait for a new message */
     for (;;)
     {
@@ -144,7 +146,6 @@ ClientConnectionThread(HANDLE ServerPort)
         
         /* Get the CSR Message */
         Request = (PCSR_API_MESSAGE)&LpcRequest;
-        Reply = (PCSR_API_MESSAGE)&LpcReply;
       
         DPRINT("CSR: Got CSR API: %x [Message Origin: %x]\n", 
                 Request->Type,