diff --git a/apps/api/src/api/tool_instances.py b/apps/api/src/api/tool_instances.py
index dbedef5..899b173 100644
--- a/apps/api/src/api/tool_instances.py
+++ b/apps/api/src/api/tool_instances.py
@@ -827,7 +827,7 @@ async def get_user_sessions(
     result = await session.execute(
         select(ToolInstance)
         .where(ToolInstance.owner_id == user_id)
-        .where(ToolInstance.status.in_(["running", "building", "pending"]))
+        .where(ToolInstance.status.in_(["running", "building", "pending", "stopped", "error"]))
         .order_by(ToolInstance.created_at.desc())
     )
     instances = result.scalars().all()
diff --git a/apps/web/src/pages/sessions.tsx b/apps/web/src/pages/sessions.tsx
index dee1979..fc19378 100644
--- a/apps/web/src/pages/sessions.tsx
+++ b/apps/web/src/pages/sessions.tsx
@@ -92,12 +92,12 @@ export const SessionsPage = () => {
   }, [selectedProject]);
 
   const activeSessions = useMemo(
-    () => sessions.filter((s) => s.status === "running"),
+    () => sessions.filter((s) => ["running", "building", "pending"].includes(s.status)),
     [sessions]
   );
 
   const recentSessions = useMemo(
-    () => sessions.filter((s) => s.status !== "running").slice(0, 5),
+    () => sessions.filter((s) => ["stopped", "error"].includes(s.status)).slice(0, 5),
     [sessions]
   );
 
@@ -259,7 +259,7 @@ export const SessionsPage = () => {
                           </a>
                         </p>
                       )}
-                      <span className="status-badge running">running</span>
+                      <span className={`status-badge ${session.status}`}>{session.status}</span>
                     </div>
                     <div className="session-actions">
                       {session.url ? (