diff --git a/src/main/java/com/oronaminc/join/websocket/config/WebSocketConfig.java b/src/main/java/com/oronaminc/join/websocket/config/WebSocketConfig.java
index 5c8c2ad..90f8bd3 100644
--- a/src/main/java/com/oronaminc/join/websocket/config/WebSocketConfig.java
+++ b/src/main/java/com/oronaminc/join/websocket/config/WebSocketConfig.java
@@ -10,6 +10,7 @@
 import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer;
 import org.springframework.web.socket.config.annotation.WebSocketTransportRegistration;
 import org.springframework.web.socket.handler.WebSocketHandlerDecoratorFactory;
+import org.springframework.web.socket.server.support.HttpSessionHandshakeInterceptor;
 
 import com.oronaminc.join.websocket.handshake.CustomHandshakeHandler;
 import com.oronaminc.join.websocket.session.CustomWebSocketHandlerDecorator;
@@ -49,9 +50,9 @@ public void registerStompEndpoints(StompEndpointRegistry registry) {
         registry.addEndpoint("/ws")
                 .setAllowedOriginPatterns("*")
                 // websocket 연결 전 쿠키 체크
-                // .addInterceptors(new HttpSessionHandshakeInterceptor())
+                .addInterceptors(new HttpSessionHandshakeInterceptor())
                 // websocket 연결 후 principal 생성
-                // .setHandshakeHandler(handshakeHandler)
+                .setHandshakeHandler(handshakeHandler)
                 .withSockJS();
 
         registry.addEndpoint("/ws")