diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/support/WebSocketHttpRequestHandler.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/support/WebSocketHttpRequestHandler.java
index 83e3c97d22..8997439989 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/server/support/WebSocketHttpRequestHandler.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/server/support/WebSocketHttpRequestHandler.java
@@ -65,7 +65,7 @@ public class WebSocketHttpRequestHandler implements HttpRequestHandler {
 		Assert.notNull(webSocketHandler, "webSocketHandler must not be null");
 		Assert.notNull(handshakeHandler, "handshakeHandler must not be null");
 		this.webSocketHandler = decorateWebSocketHandler(webSocketHandler);
-		this.handshakeHandler = new DefaultHandshakeHandler();
+		this.handshakeHandler = handshakeHandler;
 	}