diff --git a/src/org/kreed/vanilla/PlaybackService.java b/src/org/kreed/vanilla/PlaybackService.java
index c9a25147..8b96f735 100644
--- a/src/org/kreed/vanilla/PlaybackService.java
+++ b/src/org/kreed/vanilla/PlaybackService.java
@@ -574,6 +574,10 @@ public final class PlaybackService extends Service implements Handler.Callback,
 		if (mMediaPlayer == null)
 			return;
 
+		synchronized (mMediaPlayer) {
+			mMediaPlayer.stop();
+		}
+
 		Song song = mTimeline.shiftCurrentSong(delta);
 		if (song == null) {
 			if (Song.isSongAvailable())