diff --git a/utils/clientId.go b/utils/clientId.go
index 34b5d6503..86ad7e45f 100644
--- a/utils/clientId.go
+++ b/utils/clientId.go
@@ -28,7 +28,7 @@ func GetIPAddressFromRequest(req *http.Request) string {
 	ipAddressString := req.RemoteAddr
 	xForwardedFor := req.Header.Get("X-FORWARDED-FOR")
 	if xForwardedFor != "" {
-		ipAddressString = xForwardedFor
+		return xForwardedFor
 	}
 
 	ip, _, err := net.SplitHostPort(ipAddressString)