diff --git a/packages/core-api/src/defaults.ts b/packages/core-api/src/defaults.ts
index a6d344be67..05b1f33d96 100644
--- a/packages/core-api/src/defaults.ts
+++ b/packages/core-api/src/defaults.ts
@@ -34,7 +34,7 @@ export const defaults = {
         userCache: {
             expiresIn: process.env.CORE_API_RATE_LIMIT_USER_EXPIRES || 60000,
         },
-        trustProxy: true,
+        trustProxy: !!process.env.CORE_API_TRUST_PROXY,
     },
     pagination: {
         limit: 100,