diff --git a/src/org/kreed/tumult/MusicPlayer.java b/src/org/kreed/tumult/MusicPlayer.java
index 7d827e31..8198209f 100644
--- a/src/org/kreed/tumult/MusicPlayer.java
+++ b/src/org/kreed/tumult/MusicPlayer.java
@@ -339,7 +339,8 @@ public class MusicPlayer implements Runnable, MediaPlayer.OnCompletionListener,
 			mMediaPlayer.reset();
 			mMediaPlayer.setDataSource(song.path);
 			mMediaPlayer.prepare();
-			play();
+			if (mState == STATE_PLAYING)
+				play();
 		} catch (IOException e) {
 			Log.e("Tumult", "IOException", e);
 		}