diff --git a/.github/workflows/app.yml b/.github/workflows/app.yml
index 3c0ab0f1..1d82714a 100644
--- a/.github/workflows/app.yml
+++ b/.github/workflows/app.yml
@@ -18,11 +18,7 @@ jobs:
       - uses: dart-lang/setup-dart@a57a6c04cf7d4840e88432aad6281d1e125f0d46
         with:
           sdk: ${{ env.dart_version }}
-      - uses: famedly/backend-build-workflows/.github/actions/rust-prepare@main
-        with:
-          gitlab_user: ${{ secrets.GITLAB_USER }}
-          gitlab_pass: ${{ secrets.GITLAB_PASS }}
-          gitlab_ssh: ${{ secrets.CI_SSH_PRIVATE_KEY}}
+      - uses: famedly/backend-build-workflows/.github/actions/rust-prepare@v4
       - name: Run tests
         run: |
           export HOMESERVER_IMPLEMENTATION=${{matrix.homeserver}}
@@ -68,11 +64,7 @@ jobs:
         with:
           sdk: ${{ env.dart_version }}
           #architecture: "arm64"
-      - uses: famedly/backend-build-workflows/.github/actions/rust-prepare@main
-        with:
-          gitlab_user: ${{ secrets.GITLAB_USER }}
-          gitlab_pass: ${{ secrets.GITLAB_PASS }}
-          gitlab_ssh: ${{ secrets.CI_SSH_PRIVATE_KEY}}
+      - uses: famedly/backend-build-workflows/.github/actions/rust-prepare@v4
       - name: Run tests
         run: |
           sudo apt-get update && sudo apt-get install --no-install-recommends --no-install-suggests -y lcov libsqlite3-0 libsqlite3-dev libssl3
diff --git a/lib/src/client.dart b/lib/src/client.dart
index 8384edfb..22a7b922 100644
--- a/lib/src/client.dart
+++ b/lib/src/client.dart
@@ -2979,10 +2979,13 @@ class Client extends MatrixApi {
         rooms[roomIndex].prev_batch = chatUpdate.timeline?.prevBatch;
       }
       rooms[roomIndex].membership = membership;
-      rooms[roomIndex].notificationCount =
-          chatUpdate.unreadNotifications?.notificationCount ?? 0;
-      rooms[roomIndex].highlightCount =
-          chatUpdate.unreadNotifications?.highlightCount ?? 0;
+
+      if (chatUpdate.unreadNotifications != null) {
+        rooms[roomIndex].notificationCount =
+            chatUpdate.unreadNotifications?.notificationCount ?? 0;
+        rooms[roomIndex].highlightCount =
+            chatUpdate.unreadNotifications?.highlightCount ?? 0;
+      }
 
       final summary = chatUpdate.summary;
       if (summary != null) {
diff --git a/test/room_test.dart b/test/room_test.dart
index 2bf1b684..e6963a4c 100644
--- a/test/room_test.dart
+++ b/test/room_test.dart
@@ -295,6 +295,8 @@ void main() {
         ),
       );
       expect(room.hasNewMessages, true);
+      expect(room.isUnreadOrInvited, true);
+      room.notificationCount = room.highlightCount = 0;
       expect(room.isUnreadOrInvited, false);
       expect(room.lastEvent?.body, 'cd');
       await updateLastEvent(