diff --git a/js/models/messages.js b/js/models/messages.js
index 0d6a393dc..3b02ae6e2 100644
--- a/js/models/messages.js
+++ b/js/models/messages.js
@@ -984,8 +984,7 @@
     },
 
     selectMessage() {
-      // Disable message selection when the context menu is displayed
-      if (window.contextMenuShown) {
+      if (window.contextMenuShown || this.get('isRss')) {
         return;
       }
 
diff --git a/ts/components/conversation/Message.tsx b/ts/components/conversation/Message.tsx
index 1c9e55a44..534374f03 100644
--- a/ts/components/conversation/Message.tsx
+++ b/ts/components/conversation/Message.tsx
@@ -1079,6 +1079,8 @@ export class Message extends React.PureComponent<Props, State> {
       divClasses.push('public-chat-message-wrapper');
     }
 
+    const enableContextMenu = !isRss && !multiSelectMode;
+
     return (
       <div
         className={classNames(divClasses)}
@@ -1128,10 +1130,10 @@ export class Message extends React.PureComponent<Props, State> {
             {isRss || multiSelectMode
               ? null
               : this.renderMenu(isIncoming, triggerId)}
-            {multiSelectMode ? null : this.renderContextMenu(triggerId)}
-            {multiSelectMode
-              ? null
-              : this.renderContextMenu(rightClickTriggerId)}
+            {enableContextMenu ? this.renderContextMenu(triggerId) : null}
+            {enableContextMenu
+              ? this.renderContextMenu(rightClickTriggerId)
+              : null}
           </div>
         </ContextMenuTrigger>
       </div>