diff --git a/Cargo.lock b/Cargo.lock
index 7546a91e6..884dceab5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2086,7 +2086,7 @@ dependencies = [
 [[package]]
 name = "collab"
 version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=5a1e94d60eea2c8612b2895dbbbdd6e5d5f03d97#5a1e94d60eea2c8612b2895dbbbdd6e5d5f03d97"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac#47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac"
 dependencies = [
  "anyhow",
  "arc-swap",
@@ -2111,7 +2111,7 @@ dependencies = [
 [[package]]
 name = "collab-database"
 version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=5a1e94d60eea2c8612b2895dbbbdd6e5d5f03d97#5a1e94d60eea2c8612b2895dbbbdd6e5d5f03d97"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac#47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -2140,7 +2140,7 @@ dependencies = [
 [[package]]
 name = "collab-document"
 version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=5a1e94d60eea2c8612b2895dbbbdd6e5d5f03d97#5a1e94d60eea2c8612b2895dbbbdd6e5d5f03d97"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac#47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac"
 dependencies = [
  "anyhow",
  "arc-swap",
@@ -2160,7 +2160,7 @@ dependencies = [
 [[package]]
 name = "collab-entity"
 version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=5a1e94d60eea2c8612b2895dbbbdd6e5d5f03d97#5a1e94d60eea2c8612b2895dbbbdd6e5d5f03d97"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac#47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac"
 dependencies = [
  "anyhow",
  "bytes",
@@ -2179,7 +2179,7 @@ dependencies = [
 [[package]]
 name = "collab-folder"
 version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=5a1e94d60eea2c8612b2895dbbbdd6e5d5f03d97#5a1e94d60eea2c8612b2895dbbbdd6e5d5f03d97"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac#47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac"
 dependencies = [
  "anyhow",
  "arc-swap",
@@ -2264,7 +2264,7 @@ dependencies = [
 [[package]]
 name = "collab-user"
 version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=5a1e94d60eea2c8612b2895dbbbdd6e5d5f03d97#5a1e94d60eea2c8612b2895dbbbdd6e5d5f03d97"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac#47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac"
 dependencies = [
  "anyhow",
  "collab",
diff --git a/Cargo.toml b/Cargo.toml
index 0e0fe553d..0cf69ce61 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -111,7 +111,7 @@ percent-encoding = "2.3.1"
 appflowy-ai-client = { workspace = true, features = ["dto", "client-api"] }
 pgvector = { workspace = true, features = ["sqlx"] }
 
-collab = { workspace = true }
+collab = { workspace = true, features = ["lock_timeout"] }
 collab-document = { workspace = true }
 collab-entity = { workspace = true }
 collab-folder = { workspace = true }
@@ -285,12 +285,12 @@ debug = true
 [patch.crates-io]
 # It's diffcult to resovle different version with the same crate used in AppFlowy Frontend and the Client-API crate.
 # So using patch to workaround this issue.
-collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "5a1e94d60eea2c8612b2895dbbbdd6e5d5f03d97" }
-collab-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "5a1e94d60eea2c8612b2895dbbbdd6e5d5f03d97" }
-collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "5a1e94d60eea2c8612b2895dbbbdd6e5d5f03d97" }
-collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "5a1e94d60eea2c8612b2895dbbbdd6e5d5f03d97" }
-collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "5a1e94d60eea2c8612b2895dbbbdd6e5d5f03d97" }
-collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "5a1e94d60eea2c8612b2895dbbbdd6e5d5f03d97" }
+collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac" }
+collab-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac" }
+collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac" }
+collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac" }
+collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac" }
+collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "47dbd6c8033f8fd2999cb8d11f2d60ede121a0ac" }
 
 [features]
 history = []
diff --git a/services/appflowy-collaborate/src/group/state.rs b/services/appflowy-collaborate/src/group/state.rs
index 70eae270b..6a79a2754 100644
--- a/services/appflowy-collaborate/src/group/state.rs
+++ b/services/appflowy-collaborate/src/group/state.rs
@@ -6,7 +6,7 @@ use dashmap::mapref::one::RefMut;
 use dashmap::try_result::TryResult;
 use dashmap::DashMap;
 use tokio::time::sleep;
-use tracing::{error, event, warn};
+use tracing::{error, event, info, warn};
 
 use collab_rt_entity::user::RealtimeUser;
 
@@ -39,12 +39,13 @@ impl GroupManagementState {
       let (object_id, group) = (entry.key(), entry.value());
       if group.is_inactive().await {
         inactive_group_ids.push(object_id.clone());
-        if inactive_group_ids.len() > 5 {
+        if inactive_group_ids.len() > 10 {
           break;
         }
       }
     }
 
+    info!("Remove inactive group ids: {:?}", inactive_group_ids);
     for object_id in &inactive_group_ids {
       self.remove_group(object_id).await;
     }