diff --git a/src/org/thoughtcrime/securesms/dependencies/SignalCommunicationModule.java b/src/org/thoughtcrime/securesms/dependencies/SignalCommunicationModule.java
index f34c6c1cf7..a111d4fc9f 100644
--- a/src/org/thoughtcrime/securesms/dependencies/SignalCommunicationModule.java
+++ b/src/org/thoughtcrime/securesms/dependencies/SignalCommunicationModule.java
@@ -140,11 +140,8 @@ public class SignalCommunicationModule {
                                                           Optional.of(new SecurityEventListener(context)),
                                                           TextSecurePreferences.getLocalNumber(context),
                                                           0,
-                                                          DatabaseFactory.getLokiAPIDatabase(context));
-
-      // Loki - Set the pre key bundle store
-      // This is something that we MUST have or our Loki logic will fail
-      this.messageSender.setPreKeyBundleStore(new LokiPreKeyBundleStore(context));
+                                                          DatabaseFactory.getLokiAPIDatabase(context),
+                                                          new LokiPreKeyBundleStore(context));
     } else {
       this.messageSender.setMessagePipe(IncomingMessageObserver.getPipe(), IncomingMessageObserver.getUnidentifiedPipe());
       this.messageSender.setIsMultiDevice(TextSecurePreferences.isMultiDevice(context));