diff --git a/app/musicmuster.py b/app/musicmuster.py
index ab4ce86..0f3dad2 100755
--- a/app/musicmuster.py
+++ b/app/musicmuster.py
@@ -1531,8 +1531,9 @@ class Window(QMainWindow, Ui_MainWindow):
                     self.next_track.set_plr(session, next_plr, playlist_tab)
 
             # Tell playlist tabs to update their 'next track' highlighting
+            # Args must both be ints, so use zero for no next track
             self.signals.set_next_track_signal.emit(old_next_track.plr_id,
-                                                    next_plr_id)
+                                                    next_plr_id or 0)
 
             # Update headers
             self.update_headers()