diff --git a/SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+DataExtractionNotification.swift b/SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+DataExtractionNotification.swift
index 4b1766a0a..fd74915a9 100644
--- a/SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+DataExtractionNotification.swift	
+++ b/SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+DataExtractionNotification.swift	
@@ -21,7 +21,11 @@ extension MessageReceiver {
                     case .screenshot: return .infoScreenshotNotification
                     case .mediaSaved: return .infoMediaSavedNotification
                 }
-            }()
+            }(),
+            timestampMs: (
+                message.sentTimestamp.map { Int64($0) } ??
+                Int64(floor(Date().timeIntervalSince1970 * 1000))
+            )
         ).inserted(db)
     }
 }