diff --git a/packages/common/server/get-client-ip.ts b/packages/common/server/get-client-ip.ts
index 7928dd43..b06d6cc6 100644
--- a/packages/common/server/get-client-ip.ts
+++ b/packages/common/server/get-client-ip.ts
@@ -6,10 +6,11 @@
  */
 
 export const DEFAULT_IP_HEADER_ORDER = [
+  'openpanel-client-ip',
   'cf-connecting-ip',
   'true-client-ip',
-  'x-forwarded-for',
   'x-client-ip',
+  'x-forwarded-for',
   'x-real-ip',
   'fastly-client-ip',
   'x-cluster-client-ip',
diff --git a/packages/sdks/express/index.ts b/packages/sdks/express/index.ts
index 55175ff1..47bb623f 100644
--- a/packages/sdks/express/index.ts
+++ b/packages/sdks/express/index.ts
@@ -24,10 +24,10 @@ export default function createMiddleware(options: OpenpanelOptions) {
     const sdk = new OpenPanel(options);
     const { ip } = getClientIpFromHeaders(req.headers);
     if (ip) {
-      sdk.api.addHeader('x-client-ip', ip);
+      sdk.api.addHeader('openpanel-client-ip', ip);
     }
     if (req.headers['user-agent']) {
-      sdk.api.addHeader('x-user-agent', req.headers['user-agent'] as string);
+      sdk.api.addHeader('user-agent', req.headers['user-agent'] as string);
     }
 
     if (options.trackRequest?.(req.url)) {