diff --git a/src/main/java/io/antmedia/enterprise/streamapp/WebSocketLocalHandler.java b/src/main/java/io/antmedia/enterprise/streamapp/WebSocketLocalHandler.java
index 600e14f9..ae7c1dc4 100644
--- a/src/main/java/io/antmedia/enterprise/streamapp/WebSocketLocalHandler.java
+++ b/src/main/java/io/antmedia/enterprise/streamapp/WebSocketLocalHandler.java
@@ -98,7 +98,7 @@ private void createHandler(ApplicationContext context, Session session) {
 
 			// If user want to RTMP play, should add rtmp query in websocket URL.
 			if(io.antmedia.rest.RestServiceBase.isEnterprise() && !rtmpForward) {
-				Class clazz = Class.forName("io.antmedia.enterprise.webrtc.WebSocketSignalingHandler");
+				Class clazz = Class.forName("io.antmedia.enterprise.webrtc.WebSocketEnterpriseHandler");
 				handler = (WebSocketCommunityHandler) clazz.getConstructor(ApplicationContext.class, Session.class).newInstance(context, session);
 			}
 			else {
diff --git a/src/main/java/io/antmedia/enterprise/streamapp/WebSocketSignalingLocalHandler.java b/src/main/java/io/antmedia/enterprise/streamapp/WebSocketSignalingLocalHandler.java
index a713a747..cd20f236 100644
--- a/src/main/java/io/antmedia/enterprise/streamapp/WebSocketSignalingLocalHandler.java
+++ b/src/main/java/io/antmedia/enterprise/streamapp/WebSocketSignalingLocalHandler.java
@@ -25,7 +25,7 @@
 import io.antmedia.websocket.WebSocketConstants;
 
 
-@ServerEndpoint(value="/signaling", configurator=AMSEndpointConfigurator.class)
+@ServerEndpoint(value="/websocket/signaling", configurator=AMSEndpointConfigurator.class)
 public class WebSocketSignalingLocalHandler {
 
     WebSocketCommunityHandler handler;
@@ -43,6 +43,7 @@ public void onOpen(Session session, EndpointConfig config) {
 
         //increase max text buffer size - Chrome 90 requires
         session.setMaxTextMessageBufferSize(8192 * 10);
+        
     }