diff --git a/frontend/src/pages/WorkflowEditorPage.jsx b/frontend/src/pages/WorkflowEditorPage.jsx
index d7f3726..036f876 100644
--- a/frontend/src/pages/WorkflowEditorPage.jsx
+++ b/frontend/src/pages/WorkflowEditorPage.jsx
@@ -62,11 +62,9 @@ export default function WorkflowEditorPage() {
 
   // Load workflow wenn ID vorhanden
   useEffect(() => {
-    if (id && id !== 'new' && !isNaN(parseInt(id))) {
+    if (id && id !== 'new') {
       console.log('🔍 useEffect: Loading workflow with ID:', id)
-      loadWorkflow(parseInt(id))
-    } else if (id && id !== 'new') {
-      console.error('❌ useEffect: Invalid ID (NaN):', id)
+      loadWorkflow(id)  // UUID as string, no parseInt!
     }
   }, [id])
 
@@ -419,7 +417,7 @@ export default function WorkflowEditorPage() {
                       const selectedPrompt = availablePrompts.find(p => String(p.id) === promptId)
                       console.log('📋 Selected prompt object:', selectedPrompt)
                       handleNodeUpdate(selectedNode.id, {
-                        prompt_id: promptId ? parseInt(promptId) : null,
+                        prompt_id: promptId || null,  // UUID as string, no parseInt!
                         prompt_name: selectedPrompt?.name || null
                       })
                     }}