diff --git a/src/main/java/com/ntlab/irisserver/WebSocketConfig.java b/src/main/java/com/ntlab/irisserver/WebSocketConfig.java
index b2c1f5a..afb45c0 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((WebSocketHandler) helloWorldWebSocket(), "/ws");
+        registry.addHandler(helloWorldWebSocket(), "/unit").setAllowedOrigins("*");
     }
 
     @Bean
diff --git a/src/main/java/com/ntlab/irisserver/resources/HelloWorld.java b/src/main/java/com/ntlab/irisserver/resources/HelloWorld.java
index 8f305d7..d5f1220 100644
--- a/src/main/java/com/ntlab/irisserver/resources/HelloWorld.java
+++ b/src/main/java/com/ntlab/irisserver/resources/HelloWorld.java
@@ -10,7 +10,7 @@
 public class HelloWorld {
     @GET
     public String getHello() {
-        return "WebSocketのデモの追加。12/11-11:30";
+        return "WebSocketのデモの追加。12/11-13:55";
     }
 
 }
diff --git a/src/main/java/com/ntlab/irisserver/websockets/HelloWorldWebSocket.java b/src/main/java/com/ntlab/irisserver/websockets/HelloWorldWebSocket.java
index ba643eb..9598f46 100644
--- a/src/main/java/com/ntlab/irisserver/websockets/HelloWorldWebSocket.java
+++ b/src/main/java/com/ntlab/irisserver/websockets/HelloWorldWebSocket.java
@@ -1,5 +1,8 @@
 package com.ntlab.irisserver.websockets;
 
+import org.springframework.web.socket.WebSocketHandler;
+import org.springframework.web.socket.handler.TextWebSocketHandler;
+
 import javax.websocket.*;
 import javax.websocket.server.ServerEndpoint;
 import java.text.SimpleDateFormat;
@@ -13,7 +16,7 @@
 
 // ５秒に１回HelloWorldを送るデモ
 @ServerEndpoint("/hello-websocket")
-public class HelloWorldWebSocket {
+public class HelloWorldWebSocket extends TextWebSocketHandler {
     private static final Queue<Session> sessions = new ConcurrentLinkedQueue<>();
 
     static {