diff --git a/lib/pangea/course_creation/course_invite_page.dart b/lib/pangea/course_creation/course_invite_page.dart
index c02259b39..2af4659e8 100644
--- a/lib/pangea/course_creation/course_invite_page.dart
+++ b/lib/pangea/course_creation/course_invite_page.dart
@@ -11,6 +11,8 @@ import 'package:fluffychat/l10n/l10n.dart';
 import 'package:fluffychat/pangea/bot/utils/bot_name.dart';
 import 'package:fluffychat/pangea/course_creation/course_info_chip_widget.dart';
 import 'package:fluffychat/pangea/course_plans/courses/course_plan_builder.dart';
+import 'package:fluffychat/pangea/course_plans/courses/course_plan_room_extension.dart';
+import 'package:fluffychat/pangea/events/constants/pangea_event_types.dart';
 import 'package:fluffychat/widgets/avatar.dart';
 import 'package:fluffychat/widgets/future_loading_dialog.dart';
 import 'package:fluffychat/widgets/matrix.dart';
@@ -49,7 +51,17 @@ class CourseInvitePageController extends State<CourseInvitePage>
     if (widget.courseCreationCompleter == null) {
       throw Exception("No course creation completer provided");
     }
-    return widget.courseCreationCompleter!.future;
+    final spaceId = await widget.courseCreationCompleter!.future;
+    final room = Matrix.of(context).client.getRoomById(spaceId);
+    if (room == null || room.coursePlan == null) {
+      await Matrix.of(context).client.onRoomState.stream.firstWhere((event) {
+        return event.roomId == spaceId &&
+            event.state.type == PangeaEventTypes.coursePlan;
+      }).timeout(
+        const Duration(seconds: 10),
+      );
+    }
+    return spaceId;
   }
 
   @override
diff --git a/lib/pangea/spaces/utils/client_spaces_extension.dart b/lib/pangea/spaces/utils/client_spaces_extension.dart
index 99fed4451..d72c85a58 100644
--- a/lib/pangea/spaces/utils/client_spaces_extension.dart
+++ b/lib/pangea/spaces/utils/client_spaces_extension.dart
@@ -35,6 +35,11 @@ extension SpacesClientExtension on Client {
         if (initialState != null) ...initialState,
       ],
     );
+
+    if (getRoomById(roomId) == null) {
+      await waitForRoomInSync(roomId, join: true);
+    }
+
     return roomId;
   }
 }