diff --git a/IdIOHandlerWebsocket.pas b/IdIOHandlerWebsocket.pas
index 1f3fc74..fa8e431 100644
--- a/IdIOHandlerWebsocket.pas
+++ b/IdIOHandlerWebsocket.pas
@@ -545,6 +545,8 @@ end;
 
 function TIdIOHandlerWebsocket.Readable(AMSec: Integer): Boolean;
 begin
+  if FWSInputBuffer.Size > 0 then Exit(True);
+
   if not FSelectLock.TryEnter then Exit(False);
   try
     Result := inherited Readable(AMSec);