diff --git a/copyparty/web/browser.js b/copyparty/web/browser.js
index 090ae45b..54b944e5 100644
--- a/copyparty/web/browser.js
+++ b/copyparty/web/browser.js
@@ -3019,9 +3019,6 @@ function play(tid, is_ev, seek) {
 	}
 
 	if (tn >= mp.order.length) {
-		if (mpl.pb_mode == 'stop')
-			return;
-
 		if (mpl.pb_mode == 'loop' || ebi('unsearch')) {
 			tn = 0;
 		}
@@ -3029,6 +3026,7 @@ function play(tid, is_ev, seek) {
 			treectl.ls_cb = next_song;
 			return tree_neigh(1);
 		}
+		else return;
 	}
 
 	if (tn < 0) {
@@ -3039,6 +3037,7 @@ function play(tid, is_ev, seek) {
 			treectl.ls_cb = last_song;
 			return tree_neigh(-1);
 		}
+		else return;
 	}
 
 	tid = mp.order[tn];