diff --git a/Net/samples/WebSocketServer/src/WebSocketServer.cpp b/Net/samples/WebSocketServer/src/WebSocketServer.cpp
index 440ab7d5d..8e067129e 100644
--- a/Net/samples/WebSocketServer/src/WebSocketServer.cpp
+++ b/Net/samples/WebSocketServer/src/WebSocketServer.cpp
@@ -119,7 +119,7 @@ public:
 				app.logger().information(Poco::format("Frame received (length=%d, flags=0x%x).", n, unsigned(flags)));
 				ws.sendFrame(buffer, n, flags);
 			}
-			while (n > 0 || (flags & WebSocket::FRAME_OP_BITMASK) != WebSocket::FRAME_OP_CLOSE);
+			while (n > 0 && (flags & WebSocket::FRAME_OP_BITMASK) != WebSocket::FRAME_OP_CLOSE);
 			app.logger().information("WebSocket connection closed.");
 		}
 		catch (WebSocketException& exc)