diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/storage/MessagesCacheTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/storage/MessagesCacheTest.java
index 96df6cd13..8c691aa0a 100644
--- a/service/src/test/java/org/whispersystems/textsecuregcm/storage/MessagesCacheTest.java
+++ b/service/src/test/java/org/whispersystems/textsecuregcm/storage/MessagesCacheTest.java
@@ -72,6 +72,17 @@ public class MessagesCacheTest extends AbstractRedisClusterTest {
         assertTrue(messagesCache.insert(messageGuid, DESTINATION_UUID, DESTINATION_DEVICE_ID, generateRandomMessage(messageGuid, sealedSender)) > 0);
     }
 
+    @Test
+    public void testDoubleInsertGuid() {
+        final UUID                   duplicateGuid    = UUID.randomUUID();
+        final MessageProtos.Envelope duplicateMessage = generateRandomMessage(duplicateGuid, false);
+
+        final long firstId  = messagesCache.insert(duplicateGuid, DESTINATION_UUID, DESTINATION_DEVICE_ID, duplicateMessage);
+        final long secondId = messagesCache.insert(duplicateGuid, DESTINATION_UUID, DESTINATION_DEVICE_ID, duplicateMessage);
+
+        assertEquals(firstId, secondId);
+    }
+
     @Test
     public void testRepairMetadata() {
         final int distinctUuidCount = 17;