diff --git a/app/src/main/java/eu/faircode/email/ApplicationEx.java b/app/src/main/java/eu/faircode/email/ApplicationEx.java
index 36286eda75..cbffba456c 100644
--- a/app/src/main/java/eu/faircode/email/ApplicationEx.java
+++ b/app/src/main/java/eu/faircode/email/ApplicationEx.java
@@ -58,6 +58,8 @@ public class ApplicationEx extends Application
         implements androidx.work.Configuration.Provider, SharedPreferences.OnSharedPreferenceChangeListener {
     private Thread.UncaughtExceptionHandler prev = null;
 
+    private static final Object lock = new Object();
+
     @Override
     protected void attachBaseContext(Context base) {
         super.attachBaseContext(getLocalizedContext(base));
@@ -868,7 +870,9 @@ public class ApplicationEx extends Application
 
     synchronized static Handler getMainHandler() {
         if (handler == null)
-            handler = new Handler(Looper.getMainLooper());
+            synchronized (lock) {
+                handler = new Handler(Looper.getMainLooper());
+            }
         return handler;
     }
 }