diff --git a/src/app.jsx b/src/app.jsx
index 44d937ad..f0f89fa5 100644
--- a/src/app.jsx
+++ b/src/app.jsx
@@ -72,7 +72,9 @@ window.__STATES_STATS__ = () => {
   const { statuses } = states;
   const unmountedPosts = [];
   for (const key in statuses) {
-    const $post = document.querySelector(`[data-state-post-id="${key}"]`);
+    const $post = document.querySelector(
+      `[data-state-post-id="${key}"], [data-state-post-ids~="${key}"]`,
+    );
     if (!$post) {
       unmountedPosts.push(key);
     }
@@ -89,8 +91,11 @@ setInterval(() => {
   let keysCount = 0;
   const { instance } = api();
   for (const key in statuses) {
+    if (!window.__IDLE__) break;
     try {
-      const $post = document.querySelector(`[data-state-post-id~="${key}"]`);
+      const $post = document.querySelector(
+        `[data-state-post-id="${key}"], [data-state-post-ids~="${key}"]`,
+      );
       const postInNotifications = notifications.some(
         (n) => key === statusKey(n.status?.id, instance),
       );
diff --git a/src/pages/status.jsx b/src/pages/status.jsx
index 22ffdb83..86cecbec 100644
--- a/src/pages/status.jsx
+++ b/src/pages/status.jsx
@@ -1137,6 +1137,10 @@ function StatusThread({ id, closeLink = '/', instance: propInstance }) {
                 disabled={uiState === 'loading'}
                 onClick={() => setLimit((l) => l + LIMIT)}
                 style={{ marginBlockEnd: '6em' }}
+                data-state-post-ids={statuses
+                  .slice(limit)
+                  .map((s) => statusKey(s.id, instance))
+                  .join(' ')}
               >
                 <div class="ib avatars-bunch">
                   {/* show avatars for first 5 statuses */}