diff --git a/apps/web/src/pages/tool-workshop.tsx b/apps/web/src/pages/tool-workshop.tsx
index a51800c..740c754 100644
--- a/apps/web/src/pages/tool-workshop.tsx
+++ b/apps/web/src/pages/tool-workshop.tsx
@@ -89,9 +89,9 @@ export const ToolWorkshopPage = () => {
   const [showFolderForm, setShowFolderForm] = useState(false);
   const [selectedFolder, setSelectedFolder] = useState<ConfigFolder | null>(null);
 
-  const selectedToolType = toolTypes.find((t) => t.id === selectedToolTypeId) || null;
-  const toolConfigs = configs.filter((c) => c.tool_type_id === selectedToolTypeId);
-  const toolFolders = folders; // Config folders are global, not per-tool-type in current API
+  const selectedToolType = (toolTypes || []).find((t) => t.id === selectedToolTypeId) || null;
+  const toolConfigs = (configs || []).filter((c) => c.tool_type_id === selectedToolTypeId);
+  const toolFolders = folders || []; // Config folders are global, not per-tool-type in current API
 
   const loadData = useCallback(async () => {
     setStatus("loading");
@@ -101,9 +101,9 @@ export const ToolWorkshopPage = () => {
         listToolConfigs(),
         listConfigFolders(),
       ]);
-      setToolTypes(types);
-      setConfigs(cfgs);
-      setFolders(fldrs);
+      setToolTypes(types || []);
+      setConfigs(cfgs || []);
+      setFolders(fldrs || []);
       setStatus("ready");
     } catch {
       setStatus("error");