diff --git a/src/ch/blinkenlights/android/vanilla/LibraryActivity.java b/src/ch/blinkenlights/android/vanilla/LibraryActivity.java
index cec08ede..ad4f07ae 100644
--- a/src/ch/blinkenlights/android/vanilla/LibraryActivity.java
+++ b/src/ch/blinkenlights/android/vanilla/LibraryActivity.java
@@ -926,6 +926,9 @@ public class LibraryActivity
 	protected void onStateChange(int state, int toggled)
 	{
 		super.onStateChange(state, toggled);
+
+		if ((state & PlaybackService.FLAG_EMPTY_QUEUE) != 0)
+			mBottomBarControls.setSong(null);
 	}
 
 	@Override