diff --git a/app/plugins/builtins/ai_assistant/routes.py b/app/plugins/builtins/ai_assistant/routes.py
index d367355..b09ac47 100644
--- a/app/plugins/builtins/ai_assistant/routes.py
+++ b/app/plugins/builtins/ai_assistant/routes.py
@@ -126,8 +126,9 @@ async def update_provider(
 
     for field, val in data.model_dump(exclude_unset=True).items():
         setattr(provider, field, val)
-    await db.commit()
+    await db.flush()
     await db.refresh(provider)
+    await db.commit()
     return provider_to_response(provider)
 
 
@@ -209,8 +210,9 @@ async def update_model(
 
     for field, val in data.model_dump(exclude_unset=True).items():
         setattr(model, field, val)
-    await db.commit()
+    await db.flush()
     await db.refresh(model)
+    await db.commit()
     return model_to_response(model)
 
 
@@ -271,8 +273,9 @@ async def create_preset(
         tenant_id=tenant_id,
     )
     db.add(preset)
-    await db.commit()
+    await db.flush()
     await db.refresh(preset)
+    await db.commit()
     return preset_to_response(preset)
 
 
@@ -293,8 +296,9 @@ async def update_preset(
         update_data["provider_id"] = uuid.UUID(update_data["provider_id"])
     for field, val in update_data.items():
         setattr(preset, field, val)
-    await db.commit()
+    await db.flush()
     await db.refresh(preset)
+    await db.commit()
     return preset_to_response(preset)
 
 
@@ -354,8 +358,9 @@ async def create_agent(
         owner_id=user_id,
     )
     db.add(agent)
-    await db.commit()
+    await db.flush()
     await db.refresh(agent)
+    await db.commit()
     return agent_to_response(agent)
 
 
@@ -376,8 +381,9 @@ async def update_agent(
         update_data["preset_id"] = uuid.UUID(update_data["preset_id"])
     for field, val in update_data.items():
         setattr(agent, field, val)
-    await db.commit()
+    await db.flush()
     await db.refresh(agent)
+    await db.commit()
     return agent_to_response(agent)
 
 
@@ -445,8 +451,9 @@ async def create_folder(
         tenant_id=tenant_id,
     )
     db.add(folder)
-    await db.commit()
+    await db.flush()
     await db.refresh(folder)
+    await db.commit()
     return folder_to_response(folder)
 
 
@@ -477,8 +484,9 @@ async def update_folder(
             update_data["parent_id"] = None
     for field, val in update_data.items():
         setattr(folder, field, val)
-    await db.commit()
+    await db.flush()
     await db.refresh(folder)
+    await db.commit()
     return folder_to_response(folder)