diff --git a/components/todos/todo-list.tsx b/components/todos/todo-list.tsx
index a325261..1cdfe0f 100644
--- a/components/todos/todo-list.tsx
+++ b/components/todos/todo-list.tsx
@@ -41,39 +41,39 @@ interface TodoListProps {
 }
 
 function QuickInput({ products, isDemo }: { products: Product[]; isDemo: boolean }) {
-  const [, formAction] = useActionState(createTodoAction, undefined)
+  const [state, formAction] = useActionState(createTodoAction, undefined)
   const ref = useRef<HTMLFormElement>(null)
 
+  useEffect(() => {
+    if (state?.success) ref.current?.reset()
+  }, [state])
+
   return (
-    <form
-      ref={ref}
-      action={formAction}
-      onSubmit={() => setTimeout(() => ref.current?.reset(), 0)}
-      className="flex gap-2 mb-6"
-    >
-      <select
-        name="productId"
-        required
-        disabled={isDemo || products.length === 0}
-        className="border border-border rounded-lg px-3 py-1.5 text-sm bg-input-background shrink-0"
-      >
-        {products.length === 0 ? (
-          <option value="">Geen producten</option>
-        ) : (
-          products.map(p => <option key={p.id} value={p.id}>{p.name}</option>)
-        )}
-      </select>
-      <Input
-        name="title"
-        placeholder={isDemo ? 'Alleen-lezen in demo' : 'Nieuwe todo… (Enter om op te slaan)'}
-        disabled={isDemo || products.length === 0}
-        className="flex-1"
-        autoComplete="off"
-      />
-      <DemoTooltip show={isDemo}>
-        <QuickSubmitButton isDemo={isDemo || products.length === 0} />
-      </DemoTooltip>
-    </form>
+    <div className="mb-6 space-y-1">
+      <form ref={ref} action={formAction} className="flex gap-2">
+        <select
+          name="productId"
+          disabled={isDemo}
+          className="border border-border rounded-lg px-3 py-1.5 text-sm bg-input-background shrink-0"
+        >
+          <option value="">Geen product</option>
+          {products.map(p => <option key={p.id} value={p.id}>{p.name}</option>)}
+        </select>
+        <Input
+          name="title"
+          placeholder={isDemo ? 'Alleen-lezen in demo' : 'Nieuwe todo… (Enter om op te slaan)'}
+          disabled={isDemo}
+          className="flex-1"
+          autoComplete="off"
+        />
+        <DemoTooltip show={isDemo}>
+          <QuickSubmitButton isDemo={isDemo} />
+        </DemoTooltip>
+      </form>
+      {typeof state?.error === 'string' && (
+        <p className="text-xs text-error">{state.error}</p>
+      )}
+    </div>
   )
 }
 
@@ -260,15 +260,11 @@ export function TodoList({ todos, products, isDemo }: TodoListProps) {
     <div className="space-y-4">
       <QuickInput products={products} isDemo={isDemo} />
 
-      {products.length === 0 && (
-        <p className="text-sm text-muted-foreground">Maak eerst een product aan om todo&apos;s toe te voegen.</p>
-      )}
-
-      {todos.length === 0 && products.length > 0 ? (
+      {todos.length === 0 ? (
         <div className="bg-surface-container-low border border-border rounded-xl p-12 text-center">
           <p className="text-muted-foreground text-sm">Geen todo&apos;s. Voeg er een toe hierboven.</p>
         </div>
-      ) : todos.length > 0 ? (
+      ) : (
         <>
           <div className="bg-surface-container-low border border-border rounded-xl divide-y divide-border">
             {open.map(todo => (
@@ -321,7 +317,7 @@ export function TodoList({ todos, products, isDemo }: TodoListProps) {
             </div>
           )}
         </>
-      ) : null}
+      )}
 
       {promotePbi && (
         <PromotePbiDialog todo={promotePbi} products={products} onClose={() => setPromotePbi(null)} />