diff --git a/ts/components/StoryViewer.tsx b/ts/components/StoryViewer.tsx
index 06564379360..149b0fbb769 100644
--- a/ts/components/StoryViewer.tsx
+++ b/ts/components/StoryViewer.tsx
@@ -300,10 +300,11 @@ export const StoryViewer = ({
   const [pauseStory, setPauseStory] = useState(false);
 
   const shouldPauseViewing =
+    Boolean(confirmDeleteStory) ||
+    currentViewTarget != null ||
     hasActiveCall ||
     hasConfirmHideStory ||
     hasExpandedCaption ||
-    currentViewTarget != null ||
     isShowingContextMenu ||
     pauseStory ||
     Boolean(reactionEmoji);
diff --git a/ts/util/cleanup.ts b/ts/util/cleanup.ts
index 0af027057e6..df3c43b6d64 100644
--- a/ts/util/cleanup.ts
+++ b/ts/util/cleanup.ts
@@ -4,6 +4,7 @@
 import type { MessageAttributesType } from '../model-types.d';
 import { deletePackReference } from '../types/Stickers';
 import { isStory } from '../messages/helpers';
+import { isDirectConversation } from './whatTypeOfConversation';
 
 export async function cleanupMessage(
   message: MessageAttributesType
@@ -19,7 +20,10 @@ export async function cleanupMessage(
 
   await deleteMessageData(message);
 
-  if (isStory(message)) {
+  if (
+    isStory(message) &&
+    isDirectConversation(parentConversation?.attributes)
+  ) {
     await fixupStoryReplies(conversationId, id);
   }
 }