diff --git a/src/utils.ts b/src/utils.ts
index 4c1966fac..fac18f3d8 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -951,7 +951,11 @@ const messagePaginationLinear = ({
 };
 
 export const messageSetPagination = (params: MessagePaginationUpdatedParams) => {
-  if (params.parentSet.messages.length < params.returnedPage.length) {
+  const messagesFilteredLocally = params.returnedPage.filter(({ shadowed }) => shadowed);
+  if (
+    params.parentSet.messages.length + messagesFilteredLocally.length <
+    params.returnedPage.length
+  ) {
     params.logger?.(
       'error',
       'Corrupted message set state: parent set size < returned page size',