diff --git a/ChangeLog b/ChangeLog
index 695df7dcd..26ff7c9b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -35,6 +35,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - rfe #1379201 [core] Add option to configure session_save_path.
 + [interface] Provide links to documentation in highlighted SQL.
 + [interface] It is now possible to bookmark most pages in JS capable browser.
+- bug #2936482 [core] Fix SSL detection.
 
 3.3.0.0 (not yet released)
 + rfe #2308632 [edit] Use hex for (var)binary fields,
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 1cb69255d..741540d7c 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -792,7 +792,7 @@ class PMA_Config
      */
     public function isHttps()
     {
-        static $is_https = false;
+        static $is_https = null;
 
         if (null !== $is_https) {
             return $is_https;