diff --git a/src/main/java/io/antmedia/enterprise/streamapp/AMSEndpointConfigurator.java b/src/main/java/io/antmedia/enterprise/streamapp/AMSEndpointConfigurator.java
index e427491d..34e1412c 100644
--- a/src/main/java/io/antmedia/enterprise/streamapp/AMSEndpointConfigurator.java
+++ b/src/main/java/io/antmedia/enterprise/streamapp/AMSEndpointConfigurator.java
@@ -1,19 +1,24 @@
 package io.antmedia.enterprise.streamapp;
 
+import jakarta.servlet.http.HttpServletRequest;
 import jakarta.websocket.HandshakeResponse;
 import jakarta.websocket.server.HandshakeRequest;
 import jakarta.websocket.server.ServerEndpointConfig;
 
+import org.apache.catalina.connector.RequestFacade;
 import org.apache.tomcat.websocket.server.DefaultServerEndpointConfigurator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.lang.reflect.Field;
 import java.util.List;
 import java.util.Map;
 
 public class AMSEndpointConfigurator extends DefaultServerEndpointConfigurator {
 	public static final String USER_AGENT = "user-agent";
 	public static final String ORIGIN = "origin";
+	private static final Object X_REAL_IP = "x-real-ip";
+	public static final String CLINT_IP = "client-ip";
 
 	protected static Logger logger = LoggerFactory.getLogger(AMSEndpointConfigurator.class);
 
@@ -31,6 +36,34 @@ public void modifyHandshake(ServerEndpointConfig sec, HandshakeRequest request,
 			String origin = requestHeaders.get(ORIGIN).toString();
 			userProperties.put(ORIGIN, origin);
 		}
+		
+	    String clientIP = "N/A";
+		if(requestHeaders.containsKey(X_REAL_IP)){
+	    	clientIP  = requestHeaders.get(X_REAL_IP).toString();
+		}
+	    else {
+	    	Field requestField;
+			try {
+				requestField = request.getClass().getDeclaredField("request");
+				requestField.setAccessible(true);
+
+				RequestFacade requestFacade = (RequestFacade) requestField.get(request);
+
+		        if (requestFacade != null) {
+					requestField = requestFacade.getClass().getDeclaredField("request");
+					requestField.setAccessible(true);
+					
+					HttpServletRequest servletRequest = (HttpServletRequest) requestField.get(requestFacade);
+		        	clientIP = servletRequest.getRemoteAddr();
+		        }
+			}
+			catch (Exception e) {
+				logger.warn("Client IP cannot be gathered");
+			}
+	        
+	    }
+	    
+	    userProperties.put(CLINT_IP, clientIP);
 
 	}
 }
diff --git a/src/main/java/io/antmedia/enterprise/streamapp/WebSocketLocalHandler.java b/src/main/java/io/antmedia/enterprise/streamapp/WebSocketLocalHandler.java
index deff0c56..ac7c4a60 100644
--- a/src/main/java/io/antmedia/enterprise/streamapp/WebSocketLocalHandler.java
+++ b/src/main/java/io/antmedia/enterprise/streamapp/WebSocketLocalHandler.java
@@ -28,6 +28,8 @@ public class WebSocketLocalHandler {
 
 	WebSocketCommunityHandler handler;
 	private String userAgent = "N/A";
+	private String clientIP = "N/A";
+
 
 	protected static Logger logger = LoggerFactory.getLogger(WebSocketLocalHandler.class);
 
@@ -35,6 +37,7 @@ public class WebSocketLocalHandler {
 	public void onOpen(Session session, EndpointConfig config) {
 		if(config.getUserProperties().containsKey(AMSEndpointConfigurator.USER_AGENT)) {
 			userAgent = (String) config.getUserProperties().get(AMSEndpointConfigurator.USER_AGENT);
+			clientIP = (String) config.getUserProperties().get(AMSEndpointConfigurator.CLINT_IP);
 		}
 		
 		logger.info("Web Socket opened session:{} user-agent:{}", session.getId(), userAgent);
@@ -104,6 +107,7 @@ private void createHandler(ApplicationContext context, Session session) {
 			}
 			
 			handler.setUserAgent(userAgent);
+			handler.setClientIP(clientIP);
 		} catch (Exception e) {
 			logger.error("WebSocket handler cannot be created");
 			logger.error(ExceptionUtils.getMessage(e));
@@ -121,4 +125,4 @@ public void sendNotInitializedError(Session session) {
 			logger.error(ExceptionUtils.getStackTrace(e));
 		}
 	}
-}
+}
\ No newline at end of file