diff --git a/opendevin/server/session/manager.py b/opendevin/server/session/manager.py
index c3f9535a71..3a53f2e38c 100644
--- a/opendevin/server/session/manager.py
+++ b/opendevin/server/session/manager.py
@@ -1,6 +1,8 @@
+import asyncio
 import atexit
 import json
 import os
+import time
 from typing import Callable
 
 from fastapi import WebSocket
@@ -16,10 +18,13 @@ SESSION_CACHE_FILE = os.path.join(CACHE_DIR, 'sessions.json')
 
 class SessionManager:
     _sessions: dict[str, Session] = {}
+    cleanup_interval: int = 300
+    session_timeout: int = 600
 
     def __init__(self):
         self._load_sessions()
         atexit.register(self.close)
+        asyncio.create_task(self._cleanup_sessions())
 
     def add_session(self, sid: str, ws_conn: WebSocket):
         if sid not in self._sessions:
@@ -79,3 +84,18 @@ class SessionManager:
             pass
         except json.decoder.JSONDecodeError:
             pass
+
+    async def _cleanup_sessions(self):
+        while True:
+            current_time = time.time()
+            session_ids_to_remove = []
+            for sid, session in list(self._sessions.items()):
+                # if session inactive for a long time, remove it
+                if not session.is_alive and current_time - session.last_active_ts > self.session_timeout:
+                    session_ids_to_remove.append(sid)
+
+            for sid in session_ids_to_remove:
+                del self._sessions[sid]
+                logger.info(f'Session {sid} has been removed due to inactivity.')
+
+            await asyncio.sleep(self.cleanup_interval)