diff --git a/app/src/main/java/org/thoughtcrime/securesms/AppContext.kt b/app/src/main/java/org/thoughtcrime/securesms/AppContext.kt
new file mode 100644
index 0000000000..206e794605
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/AppContext.kt
@@ -0,0 +1,20 @@
+package org.thoughtcrime.securesms
+
+import android.util.Log
+import nl.komponents.kovenant.Kovenant
+import nl.komponents.kovenant.jvm.asDispatcher
+import org.session.libsignal.utilities.ThreadUtils
+import java.util.concurrent.Executors
+
+object AppContext {
+
+    fun configureKovenant() {
+        Kovenant.context {
+            callbackContext.dispatcher = Executors.newSingleThreadExecutor().asDispatcher()
+            workerContext.dispatcher = ThreadUtils.executorPool.asDispatcher()
+            multipleCompletion = { v1, v2 ->
+                Log.d("Loki", "Promise resolved more than once (first with $v1, then with $v2); ignoring $v2.")
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
index 00a2c4f01f..33e55e18d3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
@@ -103,6 +103,7 @@ import dagger.ObjectGraph;
 import kotlin.Unit;
 import kotlinx.coroutines.Job;
 import network.loki.messenger.BuildConfig;
+import nl.komponents.kovenant.Kovenant;
 
 import static nl.komponents.kovenant.android.KovenantAndroid.startKovenant;
 import static nl.komponents.kovenant.android.KovenantAndroid.stopKovenant;
@@ -163,6 +164,7 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
         ProcessLifecycleOwner.get().getLifecycle().addObserver(this);
         // Loki
         // ========
+        AppContext.INSTANCE.configureKovenant();
         messageNotifier = new OptimizedMessageNotifier(new DefaultMessageNotifier());
         broadcaster = new Broadcaster(this);
         threadNotificationHandler = new Handler(Looper.getMainLooper());