diff --git a/CHANGELOG.md b/CHANGELOG.md
index c3a78cd82..f2d806beb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@
 1. [](#bugfix)
     * Quietly skip missing streams in `Cache::clearCache()`
     * Fix issue in calling page.summary when no content is present in a page
+    * Fix for HUGE session timeouts [#1050](https://github.com/getgrav/grav/issues/1050)
 
 # v1.1.4
 ## 09/07/2016
diff --git a/system/src/Grav/Common/Session.php b/system/src/Grav/Common/Session.php
index 6f541e022..9f83314fe 100644
--- a/system/src/Grav/Common/Session.php
+++ b/system/src/Grav/Common/Session.php
@@ -64,6 +64,11 @@ class Session extends BaseSession
                 $domain = '';
             }
 
+            // Fix for HUGE session timeouts
+            if ($session_timeout > 99999999999) {
+                $session_timeout = 9999999999;
+            }
+
             // Define session service.
             parent::__construct($session_timeout, $session_path, $domain);