diff --git a/common/framework/datetime.php b/common/framework/datetime.php
index 6c19c0b29..5e76428cd 100644
--- a/common/framework/datetime.php
+++ b/common/framework/datetime.php
@@ -22,7 +22,7 @@ class DateTime
 	public static function formatTimestamp($format, $timestamp = null)
 	{
 		$offset = Config::get('locale.internal_timezone') ?: date('Z', $timestamp);
-		return gmdate($format, $timestamp + $offset);
+		return gmdate($format, ($timestamp ?: time()) + $offset);
 	}
 	
 	/**