diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js
index 5663d35f4..2449ab3ec 100644
--- a/js/views/conversation_view.js
+++ b/js/views/conversation_view.js
@@ -320,7 +320,7 @@
       this.titleView = new Whisper.ReactWrapperView({
         className: 'title-wrapper',
         Component: window.Signal.Components.ConversationHeader,
-        props: getHeaderProps(this.model),
+        props: getHeaderProps(),
       });
       this.updateHeader = () => this.titleView.update(getHeaderProps());
       this.listenTo(this.model, 'change', this.updateHeader);
diff --git a/ts/components/conversation/ConversationHeader.tsx b/ts/components/conversation/ConversationHeader.tsx
index 43b7070fe..0a0ec3442 100644
--- a/ts/components/conversation/ConversationHeader.tsx
+++ b/ts/components/conversation/ConversationHeader.tsx
@@ -293,7 +293,7 @@ export class ConversationHeader extends React.Component<Props> {
 
   public render() {
     const { id, isGroup, isPublic } = this.props;
-    const triggerId = `conversation-${id}`;
+    const triggerId = `conversation-${id}-${Date.now()}`;
 
     const isPrivateGroup = isGroup && !isPublic;