diff --git a/samples/boot/websocket/src/main/java/sample/websocket/WebSocketDisconnectHandler.java b/samples/boot/websocket/src/main/java/sample/websocket/WebSocketDisconnectHandler.java
index f303d7c9..6d7d3bee 100644
--- a/samples/boot/websocket/src/main/java/sample/websocket/WebSocketDisconnectHandler.java
+++ b/samples/boot/websocket/src/main/java/sample/websocket/WebSocketDisconnectHandler.java
@@ -17,6 +17,7 @@
 package sample.websocket;
 
 import java.util.Arrays;
+import java.util.Optional;
 
 import sample.data.ActiveWebSocketUser;
 import sample.data.ActiveWebSocketUserRepository;
@@ -42,14 +43,14 @@ public class WebSocketDisconnectHandler<S>
 		if (id == null) {
 			return;
 		}
-		ActiveWebSocketUser user = this.repository.findOne(id);
-		if (user == null) {
+		Optional<ActiveWebSocketUser> user = this.repository.findOne(id);
+		if (!user.isPresent()) {
 			return;
 		}
 
 		this.repository.delete(id);
 		this.messagingTemplate.convertAndSend("/topic/friends/signout",
-				Arrays.asList(user.getUsername()));
+				Arrays.asList(user.get().getUsername()));
 
 	}
 }