diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3dd6569544..bce4c85a9f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,8 @@
     * Allow custom Flex form views
     * Cleaned up and sorted the Service `idMap`
     * Allow request headers `Content-Type` to set the template type [form#221](https://github.com/getgrav/grav-plugin-form/issues/221)
+1. [](#bugfix)
+    * Fixed `Uri::hasStandardPort()` to support reverse proxy configurations [#1786](https://github.com/getgrav/grav/issues/1786)
 
 # v1.6.0-beta.5
 ## 11/05/2018
diff --git a/system/src/Grav/Common/Uri.php b/system/src/Grav/Common/Uri.php
index 274dd963a4..6b977a8f55 100644
--- a/system/src/Grav/Common/Uri.php
+++ b/system/src/Grav/Common/Uri.php
@@ -1214,7 +1214,7 @@ protected function createFromEnvironment(array $env)
      */
     protected function hasStandardPort()
     {
-        return ($this->scheme === 'http' && $this->port === 80) || ($this->scheme === 'https' && $this->port === 443);
+        return ($this->port === 80 || $this->port === 443);
     }
 
     /**