diff --git a/src/Api/Controllers/InfoController.cs b/src/Api/Controllers/InfoController.cs
index 9c6b7b8866..fcd41540d0 100644
--- a/src/Api/Controllers/InfoController.cs
+++ b/src/Api/Controllers/InfoController.cs
@@ -21,7 +21,7 @@ public class InfoController : Controller
     [HttpGet("~/ip")]
     public JsonResult Ip()
     {
-        var headerSet = new HashSet<string> { "x-forwarded-for", "cf-connecting-ip", "client-ip" };
+        var headerSet = new HashSet<string> { "x-forwarded-for", "x-connecting-ip", "cf-connecting-ip", "client-ip", "true-client-ip" };
         var headers = HttpContext.Request?.Headers
             .Where(h => headerSet.Contains(h.Key.ToLower()))
             .ToDictionary(h => h.Key);
diff --git a/src/Api/appsettings.json b/src/Api/appsettings.json
index fde1db479e..e49491857f 100644
--- a/src/Api/appsettings.json
+++ b/src/Api/appsettings.json
@@ -79,7 +79,7 @@
   "IpRateLimitOptions": {
     "EnableEndpointRateLimiting": true,
     "StackBlockedRequests": false,
-    "RealIpHeader": "CF-Connecting-IP",
+    "RealIpHeader": "X-Connecting-IP",
     "ClientIdHeader": "X-ClientId",
     "HttpStatusCode": 429,
     "IpWhitelist": [],
diff --git a/src/Core/Utilities/CoreHelpers.cs b/src/Core/Utilities/CoreHelpers.cs
index 66ff08c07e..addc213390 100644
--- a/src/Core/Utilities/CoreHelpers.cs
+++ b/src/Core/Utilities/CoreHelpers.cs
@@ -29,7 +29,7 @@ public static class CoreHelpers
     private static readonly DateTime _epoc = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
     private static readonly DateTime _max = new DateTime(9999, 1, 1, 0, 0, 0, DateTimeKind.Utc);
     private static readonly Random _random = new Random();
-    private static readonly string CloudFlareConnectingIp = "CF-Connecting-IP";
+    private static readonly string RealConnectingIp = "X-Connecting-IP";
 
     /// <summary>
     /// Generate sequential Guid for Sql Server.
@@ -557,9 +557,9 @@ public static class CoreHelpers
             return null;
         }
 
-        if (!globalSettings.SelfHosted && httpContext.Request.Headers.ContainsKey(CloudFlareConnectingIp))
+        if (!globalSettings.SelfHosted && httpContext.Request.Headers.ContainsKey(RealConnectingIp))
         {
-            return httpContext.Request.Headers[CloudFlareConnectingIp].ToString();
+            return httpContext.Request.Headers[RealConnectingIp].ToString();
         }
 
         return httpContext.Connection?.RemoteIpAddress?.ToString();
diff --git a/src/Identity/appsettings.json b/src/Identity/appsettings.json
index 609a5004aa..e3626b4e16 100644
--- a/src/Identity/appsettings.json
+++ b/src/Identity/appsettings.json
@@ -69,7 +69,7 @@
   "IpRateLimitOptions": {
     "EnableEndpointRateLimiting": true,
     "StackBlockedRequests": false,
-    "RealIpHeader": "CF-Connecting-IP",
+    "RealIpHeader": "X-Connecting-IP",
     "ClientIdHeader": "X-ClientId",
     "HttpStatusCode": 429,
     "IpWhitelist": [],