diff --git a/application/src/main/java/org/thingsboard/server/service/security/auth/rest/RestAuthenticationDetails.java b/application/src/main/java/org/thingsboard/server/service/security/auth/rest/RestAuthenticationDetails.java
index aa084a7968..e75a49ccb2 100644
--- a/application/src/main/java/org/thingsboard/server/service/security/auth/rest/RestAuthenticationDetails.java
+++ b/application/src/main/java/org/thingsboard/server/service/security/auth/rest/RestAuthenticationDetails.java
@@ -29,18 +29,10 @@ public class RestAuthenticationDetails implements Serializable {
     private final Client userAgent;
 
     public RestAuthenticationDetails(HttpServletRequest request) {
-        this.clientAddress = getClientIP(request);
+        this.clientAddress = request.getRemoteAddr();
         this.userAgent = getUserAgent(request);
     }
 
-    private static String getClientIP(HttpServletRequest request) {
-        String xfHeader = request.getHeader("X-Forwarded-For");
-        if (xfHeader == null) {
-            return request.getRemoteAddr();
-        }
-        return xfHeader.split(",")[0];
-    }
-
     private static Client getUserAgent(HttpServletRequest request) {
         Parser uaParser = new Parser();
         return uaParser.parse(request.getHeader("User-Agent"));