diff --git a/html/src/app.js b/html/src/app.js
index 140a7772..be45c22d 100644
--- a/html/src/app.js
+++ b/html/src/app.js
@@ -3718,23 +3718,23 @@ speechSynthesis.getVoices();
                 var locationBias = new Date(Date.parse(ctx.created_at) + 10000).toJSON(); //10 seconds
                 for (var k = w - 1; k > -1; k--) {
                     var feedItem = wristArr[k];
+                    if ((feedItem.created_at > locationBias) || (feedItem.type === 'Location')) {
+                        break;
+                    }
                     if (feedItem.type === 'OnPlayerJoined') {
                         wristArr.splice(k, 1);
                         w--;
                     }
-                    if ((feedItem.created_at > locationBias) || (feedItem.type === 'Location')) {
-                        break;
-                    }
                 }
                 for (var k = n - 1; k > -1; k--) {
                     var feedItem = notyArr[k];
+                    if (feedItem.created_at > locationBias) {
+                        break;
+                    }
                     if (feedItem.type === 'OnPlayerJoined') {
                         notyArr.splice(k, 1);
                         n--;
                     }
-                    if (feedItem.created_at > locationBias) {
-                        break;
-                    }
                 }
                 if (w >= 20) {
                     locationChange = true;