diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/MessageController.java b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/MessageController.java
index 5aa98fbd2..c3ce840aa 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/MessageController.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/MessageController.java
@@ -784,7 +784,7 @@ public class MessageController {
         .thenAccept(maybeDeletedMessage -> {
           maybeDeletedMessage.ifPresent(deletedMessage -> {
 
-            WebSocketConnection.recordMessageDeliveryDuration(deletedMessage.getTimestamp(),
+            WebSocketConnection.recordMessageDeliveryDuration(deletedMessage.getServerTimestamp(),
                 auth.getAuthenticatedDevice());
 
             if (deletedMessage.hasSourceUuid() && deletedMessage.getType() != Type.SERVER_DELIVERY_RECEIPT) {
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/websocket/WebSocketConnection.java b/service/src/main/java/org/whispersystems/textsecuregcm/websocket/WebSocketConnection.java
index 10288ba73..bbc552cb8 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/websocket/WebSocketConnection.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/websocket/WebSocketConnection.java
@@ -237,7 +237,7 @@ public class WebSocketConnection implements MessageAvailabilityListener, Displac
                 .thenApply(ignored -> null);
 
             if (message.getType() != Envelope.Type.SERVER_DELIVERY_RECEIPT) {
-              recordMessageDeliveryDuration(message.getTimestamp(), device);
+              recordMessageDeliveryDuration(message.getServerTimestamp(), device);
               sendDeliveryReceiptFor(message);
             }
           } else {