diff --git a/lib/pages/chat_details/chat_details.dart b/lib/pages/chat_details/chat_details.dart
index 20526841e..798ac7471 100644
--- a/lib/pages/chat_details/chat_details.dart
+++ b/lib/pages/chat_details/chat_details.dart
@@ -77,7 +77,9 @@ class ChatDetailsController extends State<ChatDetails>
   @override
   void didUpdateWidget(covariant ChatDetails oldWidget) {
     super.didUpdateWidget(oldWidget);
-    if (oldWidget.roomId != widget.roomId) {
+    final room = Matrix.of(context).client.getRoomById(widget.roomId);
+    if (oldWidget.roomId != widget.roomId ||
+        course?.uuid != room?.coursePlan?.uuid) {
       _loadCourseInfo();
       _loadSummaries();
     }
diff --git a/lib/pangea/course_creation/selected_course_page.dart b/lib/pangea/course_creation/selected_course_page.dart
index 9e658f029..f43fa3401 100644
--- a/lib/pangea/course_creation/selected_course_page.dart
+++ b/lib/pangea/course_creation/selected_course_page.dart
@@ -143,7 +143,7 @@ class SelectedCourseController extends State<SelectedCourse>
     }
 
     if (!mounted) return;
-    context.push("/rooms/spaces/${space.id}/details?tab=course");
+    context.go("/rooms/spaces/${space.id}/details?tab=course");
   }
 
   Future<void> joinCourse() async {