diff --git a/static/js/tutorial.js b/static/js/tutorial.js
index 4ad4a76c4f..e47dc26c7a 100644
--- a/static/js/tutorial.js
+++ b/static/js/tutorial.js
@@ -315,6 +315,10 @@ exports.defer = function (callback) {
     deferred_work.push(callback);
 };
 
+function update_popover_info(popover_func) {
+    current_popover_info = popover_func;
+}
+
 function finale() {
     var finale_modal = $("#tutorial-finale");
     $(".screen").css({opacity: 0.0});
@@ -331,6 +335,7 @@ function finale() {
     set_tutorial_status("finished");
     is_running = false;
     current_msg_list.clear();
+    update_popover_info(undefined);
     // Force a check on new events before we re-render the message list.
     server_events.force_get_events();
     stream_color.default_color = real_default_color;
@@ -386,10 +391,6 @@ function finale() {
     }
 }
 
-function update_popover_info(popover_func) {
-    current_popover_info = popover_func;
-}
-
 function box_first_message() {
     var spotlight_message = rows.first_visible();
     var bar = rows.get_message_recipient_row(spotlight_message);