diff --git a/ts/textsecure/MessageReceiver.ts b/ts/textsecure/MessageReceiver.ts
index d2db9293cb..256223b1c7 100644
--- a/ts/textsecure/MessageReceiver.ts
+++ b/ts/textsecure/MessageReceiver.ts
@@ -1277,6 +1277,7 @@ export default class MessageReceiver
       new DeliveryEvent(
         {
           timestamp: envelope.timestamp,
+          envelopeTimestamp: envelope.serverTimestamp,
           source: envelope.source,
           sourceUuid: envelope.sourceUuid,
           sourceDevice: envelope.sourceDevice,
diff --git a/ts/textsecure/messageReceiverEvents.ts b/ts/textsecure/messageReceiverEvents.ts
index ea90d68397..86b6731029 100644
--- a/ts/textsecure/messageReceiverEvents.ts
+++ b/ts/textsecure/messageReceiverEvents.ts
@@ -127,7 +127,7 @@ export class ConfirmableEvent extends Event {
 
 export type DeliveryEventData = Readonly<{
   timestamp: number;
-  envelopeTimestamp?: number;
+  envelopeTimestamp: number;
   source?: string;
   sourceUuid?: string;
   sourceDevice?: number;