diff --git a/public/index.php b/public/index.php
index e30f90c0..74d65eb4 100644
--- a/public/index.php
+++ b/public/index.php
@@ -20,8 +20,15 @@ if ($trustedHosts = $_SERVER['TRUSTED_HOSTS'] ?? $_ENV['TRUSTED_HOSTS'] ?? false
     Request::setTrustedHosts([$trustedHosts]);
 }
 
+
 $kernel = new Kernel($_SERVER['APP_ENV'], (bool) $_SERVER['APP_DEBUG']);
 $request = Request::createFromGlobals();
+
+//Set the proxy settings for heroku
+if ($_SERVER['HEROKU'] ?? $_ENV['HEROKU'] ?? false) {
+    Request::setTrustedProxies([$request->server->get('REMOTE_ADDR')], Request::HEADER_X_FORWARDED_ALL ^ Request::HEADER_X_FORWARDED_HOST);
+}
+
 $response = $kernel->handle($request);
 $response->send();
 $kernel->terminate($request, $response);