diff --git a/app.py b/app.py
index 9fde444..73b9447 100644
--- a/app.py
+++ b/app.py
@@ -1730,7 +1730,7 @@ def directus_db_pictures_design_options():
 @app.route("/api/directus/db-pictures/<pic_id>", methods=["PATCH"])
 def directus_db_picture_patch(pic_id):
     token = request.headers.get("Authorization", "")
-    data, status = _directus("PATCH", f"/items/db_pictures/{pic_id}", token, body=request.get_json())
+    data, status = _directus("PATCH", f"/items/db_pictures/{pic_id}", token, body=request.get_json(force=True, silent=True))
     return jsonify(data), status
 
 
diff --git a/frontend/src/api.ts b/frontend/src/api.ts
index 72cde36..f6128bd 100644
--- a/frontend/src/api.ts
+++ b/frontend/src/api.ts
@@ -347,13 +347,17 @@ export async function getDbPictures(token: string, status = 'draft'): Promise<Db
   return data.data as DbPicture[]
 }
 
-export async function updateDbPictureStatus(pictureId: string, status: string, token: string): Promise<void> {
+export async function updateDbPicture(pictureId: string, fields: Record<string, unknown>, token: string): Promise<void> {
   const res = await fetch(`/api/directus/db-pictures/${pictureId}`, {
     method: 'PATCH',
     headers: { 'Content-Type': 'application/json', Authorization: `Bearer ${token}` },
-    body: JSON.stringify({ status }),
+    body: JSON.stringify(fields),
   })
-  if (!res.ok) throw new Error('Fehler beim Aktualisieren des Bild-Status')
+  if (!res.ok) throw new Error('Fehler beim Aktualisieren des Bildes')
+}
+
+export async function updateDbPictureStatus(pictureId: string, status: string, token: string): Promise<void> {
+  return updateDbPicture(pictureId, { status }, token)
 }
 
 // ── DB Objects ────────────────────────────────────────────────────────────────
diff --git a/frontend/src/pages/DrawIt.tsx b/frontend/src/pages/DrawIt.tsx
index ed82154..d383c6f 100644
--- a/frontend/src/pages/DrawIt.tsx
+++ b/frontend/src/pages/DrawIt.tsx
@@ -4,6 +4,7 @@ import BlurhashCanvas from '../components/BlurhashCanvas'
 import Topbar from '../components/Topbar'
 import {
   getDbPictures,
+  updateDbPicture,
   updateDbPictureStatus,
   getDbObjects,
   createDbObject,
@@ -225,7 +226,11 @@ export default function DrawIt() {
     if (!currentPicture || !token) return
     setFinishing(true)
     try {
-      await updateDbPictureStatus(currentPicture.id, 'objects_created', token)
+      // Save status + current design in one call to avoid race conditions
+      await updateDbPicture(currentPicture.id, {
+        status: 'objects_created',
+        design: currentPicture.design ?? null,
+      }, token)
       setPictureList(prev => prev.filter(p => p.id !== currentPicture.id))
       setCurrentIndex(i => Math.max(0, i - 1))
       setObjects([])
@@ -419,14 +424,14 @@ export default function DrawIt() {
                 value={currentPicture.design || ''}
                 onChange={async e => {
                   const value = e.target.value
-                  setPictureList(prev => prev.map(p => p.id === currentPicture.id ? { ...p, design: value || null } : p))
+                  const design = value || null
+                  setPictureList(prev => prev.map(p => p.id === currentPicture.id ? { ...p, design } : p))
                   try {
-                    await fetch(`/api/directus/db-pictures/${currentPicture.id}`, {
-                      method: 'PATCH',
-                      headers: { 'Content-Type': 'application/json', Authorization: token ?? '' },
-                      body: JSON.stringify({ design: value || null }),
-                    })
-                  } catch (e) { console.error(e) }
+                    await updateDbPicture(currentPicture.id, { design }, token!)
+                    showStatus('Design gespeichert.')
+                  } catch (e) {
+                    showStatus('Fehler beim Speichern des Designs.', true)
+                  }
                 }}
                 style={{
                   width: '100%', padding: '6px 8px', borderRadius: 'var(--r-sm)',