diff --git a/app/src/main/java/eu/faircode/email/ApplicationEx.java b/app/src/main/java/eu/faircode/email/ApplicationEx.java
index 5975005a8d..1b4ce6198c 100644
--- a/app/src/main/java/eu/faircode/email/ApplicationEx.java
+++ b/app/src/main/java/eu/faircode/email/ApplicationEx.java
@@ -47,7 +47,9 @@ public class ApplicationEx extends Application {
             public void uncaughtException(Thread thread, Throwable ex) {
                 if (ownFault(ex)) {
                     Log.e(Helper.TAG, ex + "\r\n" + Log.getStackTraceString(ex));
-                    writeCrashLog(ApplicationEx.this, ex);
+
+                    if (!Helper.isPlayStoreInstall(ApplicationEx.this))
+                        writeCrashLog(ApplicationEx.this, ex);
 
                     if (prev != null)
                         prev.uncaughtException(thread, ex);
@@ -91,9 +93,6 @@ public class ApplicationEx extends Application {
     }
 
     public boolean ownFault(Throwable ex) {
-        //if (!Helper.isPlayStoreInstall(this))
-        //    return true;
-
         if (ex instanceof OutOfMemoryError)
             return false;
 
diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java
index ec36f55c31..8a5e14bfe5 100644
--- a/app/src/main/java/eu/faircode/email/Helper.java
+++ b/app/src/main/java/eu/faircode/email/Helper.java
@@ -189,7 +189,8 @@ public class Helper {
     }
 
     static void unexpectedError(final Context context, final LifecycleOwner owner, final Throwable ex) {
-        ApplicationEx.writeCrashLog(context, ex);
+        if (!isPlayStoreInstall(context))
+            ApplicationEx.writeCrashLog(context, ex);
 
         if (owner.getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED))
             new DialogBuilderLifecycle(context, owner)