diff --git a/app/assets/javascripts/discourse/app/components/glimmer-topic-timeline.js b/app/assets/javascripts/discourse/app/components/glimmer-topic-timeline.js
index 5725c18ee8b..191a5ba9ca3 100644
--- a/app/assets/javascripts/discourse/app/components/glimmer-topic-timeline.js
+++ b/app/assets/javascripts/discourse/app/components/glimmer-topic-timeline.js
@@ -62,6 +62,10 @@ export default class GlimmerTopicTimeline extends Component {
 
   @bind
   addUserTip(element) {
+    if (!this.currentUser) {
+      return;
+    }
+
     this.currentUser.showUserTip({
       id: "topic_timeline",
       titleText: I18n.t("user_tips.topic_timeline.title"),
diff --git a/app/assets/javascripts/discourse/tests/acceptance/topic-notifications-button-test.js b/app/assets/javascripts/discourse/tests/acceptance/topic-notifications-button-test.js
index 9e9410c7e5e..cbdde122f6b 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/topic-notifications-button-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/topic-notifications-button-test.js
@@ -34,7 +34,7 @@ acceptance("Topic Notifications button", function (needs) {
     );
 
     const timelineNotificationOptions = selectKit(
-      ".topic-timeline .widget-component-connector .topic-notifications-options"
+      ".topic-timeline .topic-notifications-options"
     );
 
     assert.strictEqual(