diff --git a/spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/config/SampleWebSocketsApplication.java b/spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/config/SampleWebSocketsApplication.java
index 2adde70e43..15ce99f139 100644
--- a/spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/config/SampleWebSocketsApplication.java
+++ b/spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/config/SampleWebSocketsApplication.java
@@ -55,12 +55,12 @@ public class SampleWebSocketsApplication extends SpringBootServletInitializer {
 
 	@Bean(name = "/echo")
 	public WebSocketHandler echoWebSocketHandler() {
-		return new PerConnectionWebSocketHandler(EchoWebSocketHandler.class);
+		return new EchoWebSocketHandler(echoService());
 	}
 
 	@Bean(name = "/snake")
 	public WebSocketHandler snakeWebSocketHandler() {
-		return new SnakeWebSocketHandler();
+		return new PerConnectionWebSocketHandler(SnakeWebSocketHandler.class);
 	}
 
 }