diff --git a/src/Horse.Provider.Socket.WebSocket.pas b/src/Horse.Provider.Socket.WebSocket.pas
index eb3b31c..f1182e4 100644
--- a/src/Horse.Provider.Socket.WebSocket.pas
+++ b/src/Horse.Provider.Socket.WebSocket.pas
@@ -10,11 +10,20 @@ interface
   SysUtils, Classes,
   {$IF DEFINED(FPC)}
     Sockets,
+    {$IFDEF MSWINDOWS}
+      { FIX-WS-NONBLOCK  WSAGetLastError / select / TFDSet }
+      WinSock2,
+    {$ELSE}
+      { FIX-WS-NONBLOCK  fpgeterrno, ESysEAGAIN, fpSelect, fpFD_* , TTimeVal }
+      BaseUnix,
+    {$ENDIF}
   {$ELSE}
     {$IFDEF MSWINDOWS}
       Winapi.WinSock2,
     {$ELSE}
       Posix.SysSocket, Posix.Unistd,
+      { FIX-WS-NONBLOCK  errno / EAGAIN / select / fd_set / timeval }
+      Posix.Errno, Posix.SysSelect, Posix.SysTime,
     {$ENDIF}
   {$ENDIF}
   Horse.Core.WebSocket;
@@ -39,6 +48,9 @@   THorseWebSocketSocketTransport = class(TInterfacedObject, IHorseWebSocketTrans
     FIsClosed: Boolean;
     FClientIP: string;
     FServerPort: Integer;
+    { FIX-WS-NONBLOCK }
+    function WouldBlock: Boolean;
+    function WaitReadable(const ATimeoutMS: Integer): Boolean;
   public
     constructor Create(ASocket: TSocket; const AClientIP: string = ''; const AServerPort: Integer = 0);
     function Read(var ABuffer: TBytes; const ACount: Integer): Integer;
@@ -61,6 +73,11 @@   THorseWebSocketSocketUpgrader = class(THorseWebSocketUpgrader)
     function Upgrade(const APath: string; const AHeartbeatInterval: Integer = 0): IHorseWebSocketConnection; override;
   end;
 
+const
+  { FIX-WS-NONBLOCK  one select() tick. A timeout is not a disconnect, so Read
+    simply retries; this only bounds how often the loop re-checks FIsClosed. }
+  WS_SOCKET_READ_TICK_MS = 250;
+
 implementation
 
 { THorseWebSocketSocketTransport }
@@ -74,25 +91,157 @@ constructor THorseWebSocketSocketTransport.Create(ASocket: TSocket; const AClien
   FServerPort := AServerPort;
 end;
 
+{ FIX-WS-NONBLOCK  distinguish "no data yet" from "peer closed".
+
+  IOCP and epoll both put accepted client sockets into non-blocking mode --
+  epoll requires it (Horse.Provider.Epoll.pas sets O_NONBLOCK on every accepted
+  fd). On a non-blocking socket, recv returns -1 with EAGAIN/EWOULDBLOCK to mean
+  "nothing available right now", which is the normal state of an idle WebSocket
+  peer, not a disconnect.
+
+  Treating every non-positive result as closed made the upgrader's read loop
+  break on its very first iteration: the connection was marked dead about a
+  millisecond after the 101, before any frame could arrive. The handler then
+  returned and the HTTP pipeline resumed, writing a stray "HTTP/1.1 200 OK"
+  onto a socket that had already been handed to WebSocket.
+
+  Only two results actually mean the connection is over:
+    recv = 0   orderly shutdown by the peer
+    recv < 0   with an errno that is NOT EAGAIN/EWOULDBLOCK/EINTR
+
+  Anything else means wait. WaitReadable blocks in select() so an idle peer
+  costs no CPU, and the loop is bounded only by the socket's own lifetime --
+  which is correct: a WebSocket peer may legitimately stay silent for minutes. }
+
+function THorseWebSocketSocketTransport.WouldBlock: Boolean;
+{$IF DEFINED(FPC)}
+  {$IFDEF MSWINDOWS}
+  var
+    LErr: Integer;
+  begin
+    LErr := WSAGetLastError;
+    Result := (LErr = WSAEWOULDBLOCK) or (LErr = WSAEINTR);
+  end;
+  {$ELSE}
+  var
+    LErr: Integer;
+  begin
+    LErr := fpgeterrno;
+    Result := (LErr = ESysEAGAIN) or (LErr = ESysEWOULDBLOCK) or (LErr = ESysEINTR);
+  end;
+  {$ENDIF}
+{$ELSE}
+  {$IFDEF MSWINDOWS}
+  var
+    LErr: Integer;
+  begin
+    LErr := WSAGetLastError;
+    Result := (LErr = WSAEWOULDBLOCK) or (LErr = WSAEINTR);
+  end;
+  {$ELSE}
+  begin
+    Result := (errno = EAGAIN) or (errno = EWOULDBLOCK) or (errno = EINTR);
+  end;
+  {$ENDIF}
+{$ENDIF}
+
+function THorseWebSocketSocketTransport.WaitReadable(const ATimeoutMS: Integer): Boolean;
+{$IF DEFINED(FPC)}
+  {$IFDEF MSWINDOWS}
+  var
+    LSet: TFDSet;
+    LTimeout: TTimeVal;
+  begin
+    LSet.fd_count := 1;
+    LSet.fd_array[0] := FSocket;
+    LTimeout.tv_sec := ATimeoutMS div 1000;
+    LTimeout.tv_usec := (ATimeoutMS mod 1000) * 1000;
+    Result := select(0, @LSet, nil, nil, @LTimeout) > 0;
+  end;
+  {$ELSE}
+  var
+    LSet: TFDSet;
+    LTimeout: TTimeVal;
+  begin
+    fpFD_ZERO(LSet);
+    fpFD_SET(FSocket, LSet);
+    LTimeout.tv_sec := ATimeoutMS div 1000;
+    LTimeout.tv_usec := (ATimeoutMS mod 1000) * 1000;
+    Result := fpSelect(FSocket + 1, @LSet, nil, nil, @LTimeout) > 0;
+  end;
+  {$ENDIF}
+{$ELSE}
+  {$IFDEF MSWINDOWS}
+  var
+    LSet: TFDSet;
+    LTimeout: TTimeVal;
+  begin
+    { Winapi.WinSock2 exposes FD_SET as a TYPE, not the usual macro-style
+      procedure, so the members are filled in by hand. }
+    LSet.fd_count := 1;
+    LSet.fd_array[0] := FSocket;
+    LTimeout.tv_sec := ATimeoutMS div 1000;
+    LTimeout.tv_usec := (ATimeoutMS mod 1000) * 1000;
+    Result := select(0, @LSet, nil, nil, @LTimeout) > 0;
+  end;
+  {$ELSE}
+  var
+    LSet: fd_set;
+    LTimeout: timeval;
+  begin
+    FD_ZERO(LSet);
+    FD_SET(FSocket, LSet);
+    LTimeout.tv_sec := ATimeoutMS div 1000;
+    LTimeout.tv_usec := (ATimeoutMS mod 1000) * 1000;
+    Result := select(FSocket + 1, @LSet, nil, nil, @LTimeout) > 0;
+  end;
+  {$ENDIF}
+{$ENDIF}
+
 function THorseWebSocketSocketTransport.Read(var ABuffer: TBytes; const ACount: Integer): Integer;
 begin
   Result := 0;
   if FIsClosed then
     Exit;
   try
-    {$IF DEFINED(FPC)}
-      Result := fprecv(FSocket, @ABuffer[0], ACount, 0);
-    {$ELSE}
-      {$IFDEF MSWINDOWS}
-        Result := recv(FSocket, ABuffer[0], ACount, 0);
+    while True do
+    begin
+      {$IF DEFINED(FPC)}
+        Result := fprecv(FSocket, @ABuffer[0], ACount, 0);
       {$ELSE}
-        Result := recv(FSocket, ABuffer[0], ACount, 0);
+        {$IFDEF MSWINDOWS}
+          Result := recv(FSocket, ABuffer[0], ACount, 0);
+        {$ELSE}
+          Result := recv(FSocket, ABuffer[0], ACount, 0);
+        {$ENDIF}
       {$ENDIF}
-    {$ENDIF}
-    if Result <= 0 then
-    begin
-      Result := 0;
-      FIsClosed := True;
+
+      if Result > 0 then
+        Exit;
+
+      { recv = 0 is an orderly shutdown -- genuinely closed. }
+      if Result = 0 then
+      begin
+        FIsClosed := True;
+        Exit;
+      end;
+
+      { recv < 0: only a would-block errno means "keep waiting". }
+      if not WouldBlock then
+      begin
+        Result := 0;
+        FIsClosed := True;
+        Exit;
+      end;
+
+      { Idle. Park in select() until data arrives or the tick expires; a
+        timeout is not a disconnect, so simply retry. }
+      WaitReadable(WS_SOCKET_READ_TICK_MS);
+      if FIsClosed then
+      begin
+        Result := 0;
+        Exit;
+      end;
     end;
   except
     Result := 0;