diff --git a/CHANGELOG.md b/CHANGELOG.md
index f5a3b6165..fb5c6c97b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ Exclamation symbols (:exclamation:) note something of importance e.g. breaking c
 ### Deprecated
 ### Removed
 ### Fixed
+- `forward_date` is now correctly saved to the DB.
 ### Security
 
 ## [0.57.0] - 2019-06-01
diff --git a/src/DB.php b/src/DB.php
index d3330f0b5..e4108d21b 100644
--- a/src/DB.php
+++ b/src/DB.php
@@ -881,18 +881,17 @@ public static function insertMessageRequest(Message $message)
         }
 
         // Insert the forwarded message user in users table
-        $forward_date = null;
+        $forward_date = $message->getForwardDate() ? self::getTimestamp($message->getForwardDate()) : null;
+
         $forward_from = $message->getForwardFrom();
         if ($forward_from instanceof User) {
-            self::insertUser($forward_from, $forward_date);
+            self::insertUser($forward_from);
             $forward_from = $forward_from->getId();
-            $forward_date = self::getTimestamp($message->getForwardDate());
         }
         $forward_from_chat = $message->getForwardFromChat();
         if ($forward_from_chat instanceof Chat) {
-            self::insertChat($forward_from_chat, $forward_date);
+            self::insertChat($forward_from_chat);
             $forward_from_chat = $forward_from_chat->getId();
-            $forward_date      = self::getTimestamp($message->getForwardDate());
         }
 
         // New and left chat member