diff --git a/SignalServiceKit/src/Loki/Database/OWSPrimaryStorage+Loki.h b/SignalServiceKit/src/Loki/Database/OWSPrimaryStorage+Loki.h
index fc86ec9df..da9e6e721 100644
--- a/SignalServiceKit/src/Loki/Database/OWSPrimaryStorage+Loki.h
+++ b/SignalServiceKit/src/Loki/Database/OWSPrimaryStorage+Loki.h
@@ -2,6 +2,8 @@
 #import <AxolotlKit/PreKeyRecord.h>
 #import <AxolotlKit/PreKeyBundle.h>
 #import <YapDatabase/YapDatabase.h>
+#import <Curve25519Kit/Ed25519.h>
+#import <AxolotlKit/AxolotlExceptions.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Loki/Database/OWSPrimaryStorage+Loki.m b/SignalServiceKit/src/Loki/Database/OWSPrimaryStorage+Loki.m
index 9b9e9e7cf..cb7475145 100644
--- a/SignalServiceKit/src/Loki/Database/OWSPrimaryStorage+Loki.m
+++ b/SignalServiceKit/src/Loki/Database/OWSPrimaryStorage+Loki.m
@@ -81,15 +81,16 @@
 
 #define LKPreKeyBundleCollection @"LKPreKeyBundleCollection"
 
-- (PreKeyBundle *)generatePreKeyBundleForContact:(NSString *)pubKey {
+- (PreKeyBundle *)generatePreKeyBundleForContact:(NSString *)pubKey forceClean:(BOOL)forceClean {
     // Check pre keys to make sure we have them
     [TSPreKeyManager checkPreKeys];
     
     ECKeyPair *_Nullable keyPair = self.identityManager.identityKeyPair;
     OWSAssertDebug(keyPair);
+    
 
     // Refresh the signed pre key if needed
-    if (self.currentSignedPreKey == nil) {
+    if (self.currentSignedPreKey == nil || forceClean) {
         SignedPreKeyRecord *signedPreKeyRecord = [self generateRandomSignedRecord];
         [signedPreKeyRecord markAsAcceptedByService];
         [self storeSignedPreKey:signedPreKeyRecord.Id signedPreKeyRecord:signedPreKeyRecord];
@@ -116,6 +117,27 @@
     return bundle;
 }
 
+- (PreKeyBundle *)generatePreKeyBundleForContact:(NSString *)pubKey {
+    int failureCount = 0;
+    BOOL forceClean = NO;
+    while (failureCount < 3) {
+        @try {
+            PreKeyBundle *preKeyBundle = [self generatePreKeyBundleForContact:pubKey forceClean:forceClean];
+            if (![Ed25519 throws_verifySignature:preKeyBundle.signedPreKeySignature
+                                       publicKey:preKeyBundle.preKeyPublic
+                                            data:preKeyBundle.signedPreKeyPublic]) {
+                @throw [NSException exceptionWithName:InvalidKeyException reason:@"KeyIsNotValidlySigned" userInfo:nil];
+            }
+            return preKeyBundle;
+        } @catch (NSException *exception) {
+            failureCount ++;
+            forceClean = YES;
+        }
+    }
+    OWSLogWarn(@"[Loki] Failed to generate a valid PreKeyBundle for %@", pubKey);
+    return nil;
+}
+
 - (PreKeyBundle *_Nullable)getPreKeyBundleForContact:(NSString *)pubKey {
     return [self.dbReadConnection preKeyBundleForKey:pubKey inCollection:LKPreKeyBundleCollection];
 }