diff --git a/docker-compose.yml b/docker-compose.yml
index d1d4517f..4e72e69f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -20,6 +20,7 @@ services:
       - 3000:1337
     environment:
       - BASE_URL=http://localhost:3000
+      - TRUST_PROXY=0
       - DATABASE_URL=postgresql://postgres@postgres/planka
       - SECRET_KEY=notsecretkey
     depends_on:
diff --git a/server/config/env/production.js b/server/config/env/production.js
index f4d1b7c4..46985a7d 100644
--- a/server/config/env/production.js
+++ b/server/config/env/production.js
@@ -273,7 +273,7 @@ module.exports = {
      *
      */
 
-    // trustProxy: true,
+    trustProxy: process.env.TRUST_PROXY,
   },
 
   /**