diff --git a/src/main/java/com/ntlab/irisserver/WebSocketConfig.java b/src/main/java/com/ntlab/irisserver/WebSocketConfig.java
index afb45c0..df1c778 100644
--- a/src/main/java/com/ntlab/irisserver/WebSocketConfig.java
+++ b/src/main/java/com/ntlab/irisserver/WebSocketConfig.java
@@ -12,7 +12,7 @@
 
     @Override
     public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) {
-        registry.addHandler(helloWorldWebSocket(), "/unit").setAllowedOrigins("*");
+        registry.addHandler(helloWorldWebSocketHandler(), "/hello-websocket");
     }
 
     @Bean
@@ -21,6 +21,11 @@
     }
 
     @Bean
+    public WebSocketHandler helloWorldWebSocketHandler() {
+        return new HelloWorldWebSocket();
+    }
+
+    @Bean
     public ServerEndpointExporter serverEndpointExporter() {
         return new ServerEndpointExporter();
     }