diff --git a/ts/components/conversation/ContactModal.tsx b/ts/components/conversation/ContactModal.tsx
index 7183fcd6e4..31d296ce04 100644
--- a/ts/components/conversation/ContactModal.tsx
+++ b/ts/components/conversation/ContactModal.tsx
@@ -191,9 +191,10 @@ export function ContactModal({
               onClick={() => {
                 if (conversation && hasStories) {
                   viewUserStories({
-                    conversationId: conversation.id,
+                    conversationId: contact.id,
                     storyViewMode: StoryViewModeType.User,
                   });
+                  hideContactModal();
                 } else {
                   setView(ContactModalView.ShowingAvatar);
                 }
diff --git a/ts/state/smart/ContactModal.tsx b/ts/state/smart/ContactModal.tsx
index 06c9d4dff2..568779c773 100644
--- a/ts/state/smart/ContactModal.tsx
+++ b/ts/state/smart/ContactModal.tsx
@@ -36,7 +36,7 @@ const mapStateToProps = (state: StateType): PropsDataType => {
     });
   }
 
-  const hasStories = getHasStoriesSelector(state)(conversationId);
+  const hasStories = getHasStoriesSelector(state)(contactId);
 
   return {
     areWeASubscriber: getAreWeASubscriber(state),