diff --git a/include/class.format.php b/include/class.format.php
index b184b26cf842306e88fc243fa961ea10f0849921..cd9b27f24657c5c95ff59699d9706912c38ae36b 100644
--- a/include/class.format.php
+++ b/include/class.format.php
@@ -441,9 +441,12 @@ class Format {
             $strftimeFallback, $timezone, $user=false) {
         global $cfg;
 
-        if ($timestamp && $fromDb) {
+        if (!$timestamp)
+            return '';
+
+        if ($fromDb)
             $timestamp = Misc::db2gmtime($timestamp);
-        }
+
         if (class_exists('IntlDateFormatter')) {
             $formatter = new IntlDateFormatter(
                 Internationalization::getCurrentLocale($user),