diff --git a/src/app/api/workspaces/[id]/tabs/route.ts b/src/app/api/workspaces/[id]/tabs/route.ts
index 3ecc22a..3cc119c 100644
--- a/src/app/api/workspaces/[id]/tabs/route.ts
+++ b/src/app/api/workspaces/[id]/tabs/route.ts
@@ -427,6 +427,9 @@ export async function GET(
           const contextId = parts[2]
           try {
             const context = JSON.parse(row.value)
+            if (!context || typeof context !== 'object') {
+              continue
+            }
             if (!messageRequestContextMap[chatId]) messageRequestContextMap[chatId] = []
             messageRequestContextMap[chatId].push({
               ...context,
@@ -447,7 +450,7 @@ export async function GET(
           const composerId = parts[1]
           try {
             const context = JSON.parse(row.value)
-            if (context.projectLayouts && Array.isArray(context.projectLayouts)) {
+            if (context && context.projectLayouts && Array.isArray(context.projectLayouts)) {
               if (!projectLayoutsMap[composerId]) {
                 projectLayoutsMap[composerId] = []
               }
diff --git a/src/app/api/workspaces/route.ts b/src/app/api/workspaces/route.ts
index da0f275..8b874d3 100644
--- a/src/app/api/workspaces/route.ts
+++ b/src/app/api/workspaces/route.ts
@@ -189,7 +189,7 @@ export async function GET() {
             const composerId = parts[1]
             try {
               const context = JSON.parse(row.value)
-              if (context.projectLayouts && Array.isArray(context.projectLayouts)) {
+              if (context && context.projectLayouts && Array.isArray(context.projectLayouts)) {
                 if (!projectLayoutsMap[composerId]) {
                   projectLayoutsMap[composerId] = []
                 }