diff --git a/src/ch/blinkenlights/android/vanilla/PlaybackService.java b/src/ch/blinkenlights/android/vanilla/PlaybackService.java
index 86baa2d4..6353a298 100644
--- a/src/ch/blinkenlights/android/vanilla/PlaybackService.java
+++ b/src/ch/blinkenlights/android/vanilla/PlaybackService.java
@@ -883,7 +883,7 @@ public final class PlaybackService extends Service
 	{
 		int toggled = oldState ^ state;
 
-		if ((toggled & FLAG_PLAYING) != 0) {
+		if ( ((toggled & FLAG_PLAYING) != 0) && mCurrentSong != null) { // user requested to start playback AND we have a song selected
 			if ((state & FLAG_PLAYING) != 0) {
 				if (mMediaPlayerInitialized)
 					mMediaPlayer.start();