diff --git a/src/api.js b/src/api.js
index e712ff6..4509d95 100644
--- a/src/api.js
+++ b/src/api.js
@@ -20,6 +20,7 @@ if (ydocUpdateCallback != null && ydocUpdateCallback.slice(-1) !== '/') {
   ydocUpdateCallback += '/'
 }
 const WORKER_DISABLED = env.getConf('y-worker-disabled') === 'true'
+const ROOM_STREAM_TTL = number.parseInt(env.getConf('y-room-stream-ttl') || '300')
 
 /**
  * @param {string} a
@@ -125,7 +126,10 @@ export class Api {
     this.persistWorker = null
 
     const addScript = WORKER_DISABLED
-      ? 'redis.call("XADD", KEYS[1], "*", "m", ARGV[1])'
+      ? `
+          redis.call("XADD", KEYS[1], "*", "m", ARGV[1])
+          redis.call("EXPIRE", KEYS[1], ${ROOM_STREAM_TTL})
+        `
       : `
           if redis.call("EXISTS", KEYS[1]) == 0 then
             redis.call("XADD", "${this.redisWorkerStreamName}", "*", "compact", KEYS[1])
@@ -133,6 +137,7 @@ export class Api {
             redis.call("SADD", "${this.prefix}:worker:checklist", KEYS[1])
           end
           redis.call("XADD", KEYS[1], "*", "m", ARGV[1])
+          redis.call("EXPIRE", KEYS[1], ${ROOM_STREAM_TTL})
         `
 
     this.redis = redis.createClient({
@@ -294,20 +299,12 @@ export class Api {
   /**
    * @param {string} room
    * @param {string} docid
-   * @param {boolean} [remove=false]
    */
-  async trimRoomStream (room, docid, remove = false) {
+  async trimRoomStream (room, docid) {
     const roomName = computeRedisRoomStreamName(room, docid, this.prefix)
     const redisLastId = await this.getRedisLastId(room, docid)
     const lastId = number.parseInt(redisLastId.split('-')[0])
-    if (remove) {
-      await this.redis.del(roomName)
-    } else {
-      await this.redis.multi()
-        .xTrim(roomName, 'MINID', lastId - this.redisMinMessageLifetime)
-        .xDelIfEmpty(roomName)
-        .exec()
-    }
+    await this.redis.xTrim(roomName, 'MINID', lastId - this.redisMinMessageLifetime)
   }
 
   /**
diff --git a/src/y-socket-io/y-socket-io.js b/src/y-socket-io/y-socket-io.js
index 0df9393..12f6bfc 100644
--- a/src/y-socket-io/y-socket-io.js
+++ b/src/y-socket-io/y-socket-io.js
@@ -537,16 +537,7 @@ export class YSocketIO {
             await this.client.store.persistDoc(namespace, 'index', doc)
           }
 
-          /**
-           * there's a possibility where the namespace is deleted after the
-           * persist promise resolved, so we have to check if the room still
-           * exist.
-           * @see cleanupNamespace
-           * @see cleanupNamespaceImpl
-           */
-          if (this.namespaceMap.has(namespace)) {
-            await this.client.trimRoomStream(namespace, 'index')
-          }
+          await this.client.trimRoomStream(namespace, 'index')
         } catch (e) {
           console.error(e)
         } finally {
@@ -687,6 +678,5 @@ export class YSocketIO {
     this.namespaceDocMap.get(namespace)?.ydoc.destroy()
     this.namespaceDocMap.delete(namespace)
     this.namespacePersistentMap.delete(namespace)
-    this.client?.trimRoomStream(namespace, 'index', true)
   }
 }