diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php
index fafedb44f..97b4a23e9 100644
--- a/classes/context/Context.class.php
+++ b/classes/context/Context.class.php
@@ -517,10 +517,6 @@ class Context
 		// Save old format to Context instance.
 		self::$_instance->allow_rewrite = $config['use_rewrite'];
 		self::$_instance->db_info = $db_info;
-		
-		// Set the internal timezone.
-		$internal_timezone = Rhymix\Framework\DateTime::getTimezoneNameByOffset($config['locale']['internal_timezone']);
-		date_default_timezone_set($internal_timezone);
 	}
 
 	/**
diff --git a/common/autoload.php b/common/autoload.php
index fc8f13b60..be9764689 100644
--- a/common/autoload.php
+++ b/common/autoload.php
@@ -6,7 +6,7 @@
 error_reporting(E_ALL ^ E_WARNING ^ E_NOTICE ^ E_STRICT ^ E_DEPRECATED);
 
 /**
- * Set the default timezone.
+ * Suppress date/time errors until the internal time zone is set (see below).
  */
 date_default_timezone_set(@date_default_timezone_get());
 
@@ -197,3 +197,9 @@ require_once RX_BASEDIR  . 'vendor/autoload.php';
  * Load system configuration.
  */
 Rhymix\Framework\Config::init();
+
+/**
+ * Set the internal timezone.
+ */
+$internal_timezone = Rhymix\Framework\DateTime::getTimezoneNameByOffset(config('locale.internal_timezone'));
+date_default_timezone_set($internal_timezone);