diff --git a/Application/PlaybackController.m b/Application/PlaybackController.m
index 42c31d826..c31f6c689 100644
--- a/Application/PlaybackController.m
+++ b/Application/PlaybackController.m
@@ -494,7 +494,7 @@
 	PlaylistEntry *pe;
 	
 	if (curEntry.status == kCogEntryStoppingAfterCurrent)
-		return;
+		pe = nil;
 	else
 		pe = [playlistController getNextEntry:curEntry];