diff --git a/src/app.jsx b/src/app.jsx
index 09affaa1..ecbd05d8 100644
--- a/src/app.jsx
+++ b/src/app.jsx
@@ -86,7 +86,7 @@ window.__STATES_STATS__ = () => {
 setInterval(() => {
   const { statuses } = states;
   for (const key in statuses) {
-    const $post = document.querySelector(`[data-state-post-id="${key}"]`);
+    const $post = document.querySelector(`[data-state-post-id~="${key}"]`);
     if (!$post) {
       delete states.statuses[key];
     }
diff --git a/src/components/status.jsx b/src/components/status.jsx
index 94f543ab..20f94705 100644
--- a/src/components/status.jsx
+++ b/src/components/status.jsx
@@ -253,7 +253,11 @@ function Status({
 
     if (group) {
       return (
-        <div class="status-group" onMouseEnter={debugHover}>
+        <div
+          data-state-post-id={sKey}
+          class="status-group"
+          onMouseEnter={debugHover}
+        >
           <div class="status-pre-meta">
             <Icon icon="group" size="l" alt="Group" />{' '}
             <NameText account={status.account} instance={instance} showAvatar />
@@ -270,7 +274,11 @@ function Status({
     }
 
     return (
-      <div class="status-reblog" onMouseEnter={debugHover}>
+      <div
+        data-state-post-id={sKey}
+        class="status-reblog"
+        onMouseEnter={debugHover}
+      >
         <div class="status-pre-meta">
           <Icon icon="rocket" size="l" />{' '}
           <NameText account={status.account} instance={instance} showAvatar />{' '}
@@ -2278,6 +2286,10 @@ function FilteredStatus({ status, filterInfo, instance, containerProps = {} }) {
   );
 
   const statusPeekRef = useTruncated();
+  const sKey =
+    statusKey(status.id, instance) +
+    ' ' +
+    (statusKey(reblog?.id, instance) || '');
 
   return (
     <div
@@ -2290,7 +2302,7 @@ function FilteredStatus({ status, filterInfo, instance, containerProps = {} }) {
       }}
       {...bindLongPressPeek()}
     >
-      <article class="status filtered" tabindex="-1">
+      <article data-state-post-id={sKey} class="status filtered" tabindex="-1">
         <b
           class="status-filtered-badge clickable badge-meta"
           title={filterTitleStr}