diff --git a/Application/PlaybackController.m b/Application/PlaybackController.m
index 2a93fda7c..42dca4124 100644
--- a/Application/PlaybackController.m
+++ b/Application/PlaybackController.m
@@ -656,6 +656,7 @@ NSDictionary *makeRGInfo(PlaylistEntry *pe) {
 
 - (void)audioPlayer:(AudioPlayer *)player pushInfo:(NSDictionary *)info toTrack:(id)userInfo {
 	PlaylistEntry *pe = (PlaylistEntry *)userInfo;
+	if (!pe) pe = [playlistController currentEntry];
 	[pe setMetadata:info];
 	[playlistView refreshCurrentTrack:self];
 	[self sendMetaData];