diff --git a/CHANGELOG b/CHANGELOG
index 6f50f60..63e4c2d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,3 +7,6 @@
 [0.3.0]
 * Set min box version to 5.3.0
 
+[0.4.0]
+* Set trust proxy correctly
+
diff --git a/production.yaml.example b/production.yaml.example
index 5530b62..9f9977b 100644
--- a/production.yaml.example
+++ b/production.yaml.example
@@ -30,6 +30,7 @@ rates_limit:
 # If you run PeerTube just behind a local proxy (nginx), keep 'loopback'
 # If you run PeerTube behind a remote proxy, add the proxy IP address (or subnet)
 trust_proxy:
+  - 172.18.0.0/16
   - 'loopback'
 
 # Your database name will be "peertube"+database.suffix