diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/MatrixClient.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/MatrixClient.kt
index e6c536ee72..fa5f083722 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/MatrixClient.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/MatrixClient.kt
@@ -91,4 +91,7 @@ interface MatrixClient : Closeable {
     fun roomMembershipObserver(): RoomMembershipObserver
 
     fun isMe(userId: UserId?) = userId == sessionId
+
+    suspend fun trackRecentlyVisitedRoom(roomId: RoomId): Result<Unit>
+    suspend fun getRecentlyVisitedRooms(): Result<List<RoomId>>
 }
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt
index 546acc6e84..cc1b4a0888 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt
@@ -438,6 +438,18 @@ class RustMatrixClient(
         }
     }
 
+    override suspend fun trackRecentlyVisitedRoom(roomId: RoomId): Result<Unit> = withContext(sessionDispatcher) {
+        runCatching {
+            client.trackRecentlyVisitedRoom(roomId.value)
+        }
+    }
+
+    override suspend fun getRecentlyVisitedRooms(): Result<List<RoomId>> = withContext(sessionDispatcher) {
+        runCatching {
+            client.getRecentlyVisitedRooms().map(::RoomId)
+        }
+    }
+
     override fun syncService(): SyncService = rustSyncService
 
     override fun sessionVerificationService(): SessionVerificationService = verificationService
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/FakeMatrixClient.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/FakeMatrixClient.kt
index 247bc4bbe9..b485257815 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/FakeMatrixClient.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/FakeMatrixClient.kt
@@ -255,4 +255,16 @@ class FakeMatrixClient(
     fun givenRemoveAvatarResult(result: Result<Unit>) {
         removeAvatarResult = result
     }
+
+    private val visitedRoomsId: MutableList<RoomId> = mutableListOf()
+
+    override suspend fun trackRecentlyVisitedRoom(roomId: RoomId): Result<Unit> {
+        visitedRoomsId.removeAll { it == roomId }
+        visitedRoomsId.add(0, roomId)
+        return Result.success(Unit)
+    }
+
+    override suspend fun getRecentlyVisitedRooms(): Result<List<RoomId>> {
+        return Result.success(visitedRoomsId)
+    }
 }