diff --git a/ts/views/conversation_view.ts b/ts/views/conversation_view.ts
index 22905eb751..af20d57e4a 100644
--- a/ts/views/conversation_view.ts
+++ b/ts/views/conversation_view.ts
@@ -3620,9 +3620,6 @@ Whisper.ConversationView = Whisper.View.extend({
     const props = message.getPropsForQuote();
 
     const contact = this.quotedMessage.getContact();
-    if (contact) {
-      this.listenTo(contact, 'change', this.renderQuotedMesage);
-    }
 
     this.quoteView = new Whisper.ReactWrapperView({
       className: 'quote-wrapper',
@@ -3640,6 +3637,12 @@ Whisper.ConversationView = Whisper.View.extend({
         },
       },
     });
+
+    if (contact) {
+      this.quoteView.listenTo(contact, 'change', () => {
+        this.renderQuotedMessage();
+      });
+    }
   },
 
   showInvalidMessageToast(messageText?: string): boolean {