diff --git a/reactos/subsystems/win32/csrss/api/wapi.c b/reactos/subsystems/win32/csrss/api/wapi.c
index 08ef04d4286..13b7a2ac572 100644
--- a/reactos/subsystems/win32/csrss/api/wapi.c
+++ b/reactos/subsystems/win32/csrss/api/wapi.c
@@ -216,6 +216,13 @@ ClientConnectionThread(HANDLE ServerPort)
                                         0,
                                         &Reply->Header,
                                         &Request->Header);
+        /* Client died, continue */
+        if (Status == STATUS_INVALID_CID)
+        {
+            Reply = NULL;
+            continue;
+        }
+
         if (!NT_SUCCESS(Status))
         {
             DPRINT1("NtReplyWaitReceivePort failed: %lx\n", Status);