diff --git a/lib/pages/search.dart b/lib/pages/search.dart
index c3c2e5ea..62032015 100644
--- a/lib/pages/search.dart
+++ b/lib/pages/search.dart
@@ -48,11 +48,8 @@ class SearchController extends State<Search> {
     final newRoomId = await Matrix.of(context)
         .client
         .joinRoom(alias?.isNotEmpty ?? false ? alias : roomId);
-    await Matrix.of(context)
-        .client
-        .onRoomUpdate
-        .stream
-        .firstWhere((r) => r.id == newRoomId);
+    await Matrix.of(context).client.onSync.stream.firstWhere(
+        (update) => update.rooms?.join?.containsKey(newRoomId) ?? false);
     return newRoomId;
   }
 
diff --git a/lib/widgets/list_items/chat_list_item.dart b/lib/widgets/list_items/chat_list_item.dart
index 60a9e72c..c8aa5f66 100644
--- a/lib/widgets/list_items/chat_list_item.dart
+++ b/lib/widgets/list_items/chat_list_item.dart
@@ -41,10 +41,9 @@ class ChatListItem extends StatelessWidget {
           (await showFutureLoadingDialog(
                       context: context,
                       future: () async {
-                        final joinedFuture = room.client.onRoomUpdate.stream
+                        final joinedFuture = room.client.onSync.stream
                             .where((u) =>
-                                u.id == room.id &&
-                                u.membership == Membership.join)
+                                u.rooms?.join?.containsKey(room.id) ?? false)
                             .first;
                         await room.join();
                         await joinedFuture;
diff --git a/lib/widgets/list_items/public_room_list_item.dart b/lib/widgets/list_items/public_room_list_item.dart
index 196bccfc..798c89b7 100644
--- a/lib/widgets/list_items/public_room_list_item.dart
+++ b/lib/widgets/list_items/public_room_list_item.dart
@@ -28,9 +28,9 @@ class PublicRoomListItem extends StatelessWidget {
     if (Matrix.of(context).client.getRoomById(roomId) == null) {
       await Matrix.of(context)
           .client
-          .onRoomUpdate
+          .onSync
           .stream
-          .firstWhere((r) => r.id == roomId);
+          .firstWhere((u) => u.rooms?.join?.containsKey(roomId) ?? false);
     }
     return roomId;
   }
diff --git a/pubspec.lock b/pubspec.lock
index 8b2f912a..13758d08 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -719,9 +719,11 @@ packages:
   matrix:
     dependency: "direct main"
     description:
-      name: matrix
-      url: "https://pub.dartlang.org"
-    source: hosted
+      path: "."
+      ref: HEAD
+      resolved-ref: e13b00d127bc68c0659188b1e8aa25f510e9398a
+      url: "https://gitlab.com/famedly/company/frontend/famedlysdk.git"
+    source: git
     version: "0.4.3"
   matrix_api_lite:
     dependency: transitive
diff --git a/pubspec.yaml b/pubspec.yaml
index 7fa84452..6cad8215 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -45,7 +45,8 @@ dependencies:
   intl: any
   localstorage: ^4.0.0+1
   lottie: ^1.1.0
-  matrix: ^0.4.3
+  matrix:
+    git: https://gitlab.com/famedly/company/frontend/famedlysdk.git
   matrix_link_text: ^1.0.2
   native_imaging:
     git: https://gitlab.com/famedly/libraries/native_imaging.git