diff --git a/static/js/feature_flags.js b/static/js/feature_flags.js
index 84e6b20731..a331f9a5d5 100644
--- a/static/js/feature_flags.js
+++ b/static/js/feature_flags.js
@@ -14,6 +14,7 @@ exports.propagate_topic_edits = true;
 exports.clicking_notification_causes_narrow = true;
 exports.collapsible = false;
 exports.dropbox_integration = false;
+exports.reminders_in_message_action_menu = false;
 
 return exports;
 
diff --git a/static/js/popovers.js b/static/js/popovers.js
index f0742929fb..6f5637e875 100644
--- a/static/js/popovers.js
+++ b/static/js/popovers.js
@@ -192,6 +192,7 @@ exports.toggle_actions_popover = function (element, id) {
             conversation_time_uri: narrow.by_conversation_and_time_uri(message, true),
             narrowed: narrow_state.active(),
             should_display_delete_option: should_display_delete_option,
+            should_display_reminder_option: feature_flags.reminders_in_message_action_menu,
         };
 
         var ypos = elt.offset().top;
diff --git a/static/templates/actions_popover_content.handlebars b/static/templates/actions_popover_content.handlebars
index 4174523758..bfd6bd26ab 100644
--- a/static/templates/actions_popover_content.handlebars
+++ b/static/templates/actions_popover_content.handlebars
@@ -13,11 +13,13 @@
         </a>
     </li>
 
+    {{#if should_display_reminder_option}}
     <li>
         <a href="#" class='reminder_button' data-message-id="{{message.id}}">
             <i class="fa fa-bell" aria-hidden="true"></i> {{t "Remind me about this" }}
         </a>
     </li>
+    {{/if}}
 
     {{#if should_display_collapse}}
     <li>