diff --git a/lib/widgets/list_items/chat_list_item.dart b/lib/widgets/list_items/chat_list_item.dart
index cb33c89a..eb9123d4 100644
--- a/lib/widgets/list_items/chat_list_item.dart
+++ b/lib/widgets/list_items/chat_list_item.dart
@@ -39,7 +39,16 @@ class ChatListItem extends StatelessWidget {
     if (!activeChat) {
       if (room.membership == Membership.invite &&
           (await showFutureLoadingDialog(
-                      context: context, future: () => room.join()))
+                      context: context,
+                      future: () async {
+                        final joinedFuture = room.client.onRoomUpdate.stream
+                            .where((u) =>
+                                u.id == room.id &&
+                                u.membership == Membership.join)
+                            .first;
+                        await room.join();
+                        await joinedFuture;
+                      }))
                   .error !=
               null) {
         return;