diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 119389366..a5aa0e127 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -6979,6 +6979,10 @@
     "messageformat": "Reacted to a story from {name}",
     "description": "Label for when a person reacts to a story"
   },
+  "icu:Quote__story-reaction--you": {
+    "messageformat": "Reacted to your story",
+    "description": "Label for when someone reacts to your story"
+  },
   "icu:Quote__story-reaction--single": {
     "messageformat": "Reacted to a story",
     "description": "Used whenever we can't find a user's first name"
diff --git a/ts/components/conversation/Message.tsx b/ts/components/conversation/Message.tsx
index 05b02c84b..d573cf952 100644
--- a/ts/components/conversation/Message.tsx
+++ b/ts/components/conversation/Message.tsx
@@ -1651,9 +1651,11 @@ export class Message extends React.PureComponent<Props, State> {
       <>
         {storyReplyContext.emoji && (
           <div className="module-message__quote-story-reaction-header">
-            {i18n('icu:Quote__story-reaction', {
-              name: storyReplyContext.authorTitle,
-            })}
+            {isIncoming
+              ? i18n('icu:Quote__story-reaction--you')
+              : i18n('icu:Quote__story-reaction', {
+                  name: storyReplyContext.authorTitle,
+                })}
           </div>
         )}
         <Quote
diff --git a/ts/components/conversation/TimelineMessage.stories.tsx b/ts/components/conversation/TimelineMessage.stories.tsx
index 608ea5c65..69d2ed130 100644
--- a/ts/components/conversation/TimelineMessage.stories.tsx
+++ b/ts/components/conversation/TimelineMessage.stories.tsx
@@ -1839,8 +1839,8 @@ export const StoryReplyYours = (): JSX.Element => {
 export const StoryReplyEmoji = (): JSX.Element => {
   const conversation = getDefaultConversation();
 
-  return renderThree({
-    ...createProps({ direction: 'outgoing', text: 'Wow!' }),
+  return renderBothDirections({
+    ...createProps({ text: 'Wow!' }),
     storyReplyContext: {
       authorTitle: conversation.firstName || conversation.title,
       conversationColor: ConversationColors[0],
diff --git a/ts/util/hydrateStoryContext.ts b/ts/util/hydrateStoryContext.ts
index 5f0fc5619..67ef4ae82 100644
--- a/ts/util/hydrateStoryContext.ts
+++ b/ts/util/hydrateStoryContext.ts
@@ -62,10 +62,8 @@ export async function hydrateStoryContext(
     );
     const newMessageAttributes: Partial<MessageAttributesType> = {
       storyReplyContext: {
+        ...context,
         attachment: undefined,
-        // This is ok to do because story replies only show in 1:1 conversations
-        // so the story that was quoted should be from the same conversation.
-        authorAci: conversation?.getAci(),
         // No messageId = referenced story not found
         messageId: '',
       },