diff --git a/src/org/kreed/tumult/MusicPlayer.java b/src/org/kreed/tumult/MusicPlayer.java
index a19af23a..051672f1 100644
--- a/src/org/kreed/tumult/MusicPlayer.java
+++ b/src/org/kreed/tumult/MusicPlayer.java
@@ -267,6 +267,8 @@ public class MusicPlayer implements Runnable, MediaPlayer.OnCompletionListener,
 			mMediaPlayer = null;
 		}
 
+		mService.unregisterReceiver(mReceiver);
+
 		if (mWakeLock != null && mWakeLock.isHeld())
 			mWakeLock.release();
 	}