diff --git a/Net/samples/WebSocketServer/src/WebSocketServer.cpp b/Net/samples/WebSocketServer/src/WebSocketServer.cpp
index aa260277a..4b8daf28b 100644
--- a/Net/samples/WebSocketServer/src/WebSocketServer.cpp
+++ b/Net/samples/WebSocketServer/src/WebSocketServer.cpp
@@ -163,7 +163,7 @@ public:
 			app.logger().information(it->first + ": " + it->second);
 		}
 		
-		if (request.getURI() == "/ws")
+		if(request.find("Upgrade") != request.end() && request["Upgrade"] == "websocket")
 			return new WebSocketRequestHandler;
 		else
 			return new PageRequestHandler;