diff --git a/src/org/thoughtcrime/securesms/crypto/KeyExchangeProcessor.java b/src/org/thoughtcrime/securesms/crypto/KeyExchangeProcessor.java
index 36f4a0d3ac..69b32856db 100644
--- a/src/org/thoughtcrime/securesms/crypto/KeyExchangeProcessor.java
+++ b/src/org/thoughtcrime/securesms/crypto/KeyExchangeProcessor.java
@@ -132,6 +132,8 @@ public class KeyExchangeProcessor {
     remoteKeyRecord.save();
     sessionRecord.save();
 
+    PreKeyRecord.delete(context, preKeyId);
+
     DatabaseFactory.getIdentityDatabase(context)
                    .saveIdentity(masterSecret, recipient, remoteIdentity);
   }