diff --git a/frontend/src/lib/constants.ts b/frontend/src/lib/constants.ts
index 4b74a5db..df1aaad1 100644
--- a/frontend/src/lib/constants.ts
+++ b/frontend/src/lib/constants.ts
@@ -21,7 +21,7 @@ export const DEFAULT_KNOWLEDGE_SETTINGS = {
  * UI Constants
  */
 export const UI_CONSTANTS = {
-  MAX_SYSTEM_PROMPT_CHARS: 2000,
+  MAX_SYSTEM_PROMPT_CHARS: 4000,
 } as const;
 
 export const ANIMATION_DURATION = 0.4;
diff --git a/src/api/settings.py b/src/api/settings.py
index ea56063b..dc9a177c 100644
--- a/src/api/settings.py
+++ b/src/api/settings.py
@@ -230,7 +230,7 @@ async def update_settings(request, session_manager):
                 flows_service = _get_flows_service()
                 await flows_service.update_chat_flow_system_prompt(
                     body["system_prompt"],
-                    current_config.provider.model_provider.lower()
+                    current_config.agent.system_prompt
                 )
                 logger.info(f"Successfully updated chat flow system prompt")
             except Exception as e: