diff --git a/src/org/kreed/vanilla/PlaybackService.java b/src/org/kreed/vanilla/PlaybackService.java
index 42b73fa3..f9f6687f 100644
--- a/src/org/kreed/vanilla/PlaybackService.java
+++ b/src/org/kreed/vanilla/PlaybackService.java
@@ -182,12 +182,9 @@ public class PlaybackService extends Service implements Runnable, MediaPlayer.On
 			saveState(true);
 
 		if (mMediaPlayer != null) {
-			MediaPlayer player = mMediaPlayer;
+			updateState(STATE_NORMAL);
+			mMediaPlayer.release();
 			mMediaPlayer = null;
-
-			if (player.isPlaying())
-				player.pause();
-			player.release();
 		}
 
 		try {