diff --git a/js/views/message_view.js b/js/views/message_view.js
index 2eba3ae7b..871163f6f 100644
--- a/js/views/message_view.js
+++ b/js/views/message_view.js
@@ -366,10 +366,6 @@
       this.timerView.update();
     },
     getQuoteObjectUrl() {
-      // Potential sources of objectUrl, as provided in Conversation.processQuotes
-      //   1. model.quotedMessage.imageUrl
-      //   2. model.quoteThumbnail.objectUrl
-
       if (this.model.quotedMessageFromDatabase) {
         return this.model.quotedMessageFromDatabase.imageUrl;
       }
@@ -415,6 +411,12 @@
       const authorColor = contact ? contact.getColor() : 'grey';
       const isFromMe = contact ? contact.id === OUR_NUMBER : false;
       const isIncoming = this.model.isIncoming();
+      const onClick = () => {
+        const { quotedMessage } = this.model;
+        if (quotedMessage) {
+          this.model.trigger('scroll-to-message', { id: quotedMessage.id });
+        }
+      };
 
       const props = {
         attachments: (quote.attachments || []).map(processAttachment),
@@ -423,12 +425,7 @@
         authorTitle,
         isFromMe,
         isIncoming,
-        onClick: () => {
-          const { quotedMessage } = this.model;
-          if (quotedMessage) {
-            this.model.trigger('scroll-to-message', { id: quotedMessage.id });
-          }
-        },
+        onClick: this.model.quotedMessage ? onClick : null,
         text: quote.text,
       };
 
diff --git a/stylesheets/_conversation.scss b/stylesheets/_conversation.scss
index 24935a3c1..22c9eae56 100644
--- a/stylesheets/_conversation.scss
+++ b/stylesheets/_conversation.scss
@@ -460,6 +460,10 @@ span.status {
       @include message-replies-colors;
       @include twenty-percent-colors;
 
+      &.no-click {
+        cursor: auto;
+      }
+
       cursor: pointer;
       display: flex;
       flex-direction: row;
diff --git a/ts/components/conversation/Quote.tsx b/ts/components/conversation/Quote.tsx
index db3a1da7f..cd3be912a 100644
--- a/ts/components/conversation/Quote.tsx
+++ b/ts/components/conversation/Quote.tsx
@@ -173,6 +173,7 @@ export class Quote extends React.Component<Props, {}> {
       authorColor,
       'quote',
       isFromMe ? 'from-me' : null,
+      !onClick ? 'no-click' : null,
     );
 
     return (