diff --git a/app/src/main/java/eu/faircode/email/MediaPlayerHelper.java b/app/src/main/java/eu/faircode/email/MediaPlayerHelper.java
index 490762a180..c1df73b361 100644
--- a/app/src/main/java/eu/faircode/email/MediaPlayerHelper.java
+++ b/app/src/main/java/eu/faircode/email/MediaPlayerHelper.java
@@ -162,9 +162,9 @@ public class MediaPlayerHelper {
     }
 
     static void startMusic(Context context, Uri uri, Runnable onCompleted) throws IOException {
-        stopMusic(context);
-
         synchronized (lock) {
+            stopMusic(context);
+
             MediaPlayerHelper.uri = uri;
             MediaPlayerHelper.onCompleted = onCompleted;