diff --git a/x-pack/platform/packages/shared/kbn-elastic-assistant/impl/assistant/common/components/assistant_settings_management/badges/index.tsx b/x-pack/platform/packages/shared/kbn-elastic-assistant/impl/assistant/common/components/assistant_settings_management/badges/index.tsx
index b84e5225c4d6f..702ea09b0f919 100644
--- a/x-pack/platform/packages/shared/kbn-elastic-assistant/impl/assistant/common/components/assistant_settings_management/badges/index.tsx
+++ b/x-pack/platform/packages/shared/kbn-elastic-assistant/impl/assistant/common/components/assistant_settings_management/badges/index.tsx
@@ -6,6 +6,7 @@
  */
 
 import { EuiBadge } from '@elastic/eui';
+import { css } from '@emotion/react';
 import React from 'react';
 
 export const BadgesColumn: React.FC<{
@@ -16,7 +17,13 @@ export const BadgesColumn: React.FC<{
   items && items.length > 0 ? (
     <div>
       {items.map((title, idx) => (
-        <EuiBadge key={`${prefix}-${idx}`} color={color}>
+        <EuiBadge
+          key={`${prefix}-${idx}`}
+          color={color}
+          css={css`
+            max-width: 400px;
+          `}
+        >
           {title}
         </EuiBadge>
       ))}
diff --git a/x-pack/platform/packages/shared/kbn-elastic-assistant/impl/assistant/prompt_editor/system_prompt/system_prompt_settings_management/use_system_prompt_table.tsx b/x-pack/platform/packages/shared/kbn-elastic-assistant/impl/assistant/prompt_editor/system_prompt/system_prompt_settings_management/use_system_prompt_table.tsx
index 4111b6002f1a7..1c9224a36acb6 100644
--- a/x-pack/platform/packages/shared/kbn-elastic-assistant/impl/assistant/prompt_editor/system_prompt/system_prompt_settings_management/use_system_prompt_table.tsx
+++ b/x-pack/platform/packages/shared/kbn-elastic-assistant/impl/assistant/prompt_editor/system_prompt/system_prompt_settings_management/use_system_prompt_table.tsx
@@ -55,6 +55,7 @@ export const useSystemPromptTable = () => {
         render: ({ conversations, id }: SystemPromptSettings) => (
           <BadgesColumn items={conversations.map(({ title }) => title)} prefix={id} />
         ),
+        width: '50%',
       },
       {
         align: 'left',
diff --git a/x-pack/platform/packages/shared/kbn-elastic-assistant/impl/assistant/settings/use_settings_updater/use_system_prompt_updater.ts b/x-pack/platform/packages/shared/kbn-elastic-assistant/impl/assistant/settings/use_settings_updater/use_system_prompt_updater.ts
index e9724c44da82a..638ab2d497012 100644
--- a/x-pack/platform/packages/shared/kbn-elastic-assistant/impl/assistant/settings/use_settings_updater/use_system_prompt_updater.ts
+++ b/x-pack/platform/packages/shared/kbn-elastic-assistant/impl/assistant/settings/use_settings_updater/use_system_prompt_updater.ts
@@ -59,6 +59,11 @@ interface SystemPromptUpdater {
   selectedSystemPrompt?: SystemPromptSettings;
   systemPromptSettings: SystemPromptSettings[];
 }
+
+const DEFAULT_SYSTEM_PROMPT_SETTINGS: SystemPromptSettings[] = [];
+const DEFAULT_SYSTEM_PROMPT_SETTINGS_UPDATES: SystemPromptSettings[] = [];
+const DEFAULT_PROMPTS_BULK_ACTIONS: PromptsPerformBulkActionRequestBody = {};
+
 export const useSystemPromptUpdater = ({
   allPrompts,
   connectors,
@@ -71,13 +76,15 @@ export const useSystemPromptUpdater = ({
   toasts,
 }: Params): SystemPromptUpdater => {
   // server equivalent
-  const [systemPromptSettings, setSystemPromptSettings] = useState<SystemPromptSettings[]>([]);
+  const [systemPromptSettings, setSystemPromptSettings] = useState<SystemPromptSettings[]>(
+    DEFAULT_SYSTEM_PROMPT_SETTINGS
+  );
   // local updates
   const [systemPromptSettingsUpdates, setSystemPromptSettingsUpdates] = useState<
     SystemPromptSettings[]
-  >([]);
+  >(DEFAULT_SYSTEM_PROMPT_SETTINGS_UPDATES);
   const [promptsBulkActions, setPromptsBulkActions] = useState<PromptsPerformBulkActionRequestBody>(
-    {}
+    DEFAULT_PROMPTS_BULK_ACTIONS
   );
   // System Prompt Selection State
   const [selectedSystemPrompt, setSelectedSystemPrompt] = useState<
@@ -105,7 +112,6 @@ export const useSystemPromptUpdater = ({
     filter,
   });
   useEffect(() => {
-    if (!Object.keys(data).length && !systemPrompts.length) return;
     const updateSystemPromptSettings = (prev: SystemPromptSettings[]) => {
       const updatedSettings = systemPrompts.map((p) => {
         const conversations = Object.values(data).filter(
@@ -121,15 +127,10 @@ export const useSystemPromptUpdater = ({
       return prev;
     };
 
-    setSystemPromptSettings(updateSystemPromptSettings);
+    setSystemPromptSettings((prev) => updateSystemPromptSettings(prev));
+    setSystemPromptSettingsUpdates((prev) => updateSystemPromptSettings(prev));
   }, [data, systemPrompts]);
 
-  useEffect(() => {
-    if (systemPromptSettings.length) {
-      setSystemPromptSettingsUpdates(systemPromptSettings);
-    }
-  }, [systemPromptSettings]);
-
   const onSystemPromptSelect = useCallback(
     (systemPrompt?: SystemPromptSettings | string) => {
       if (systemPrompt == null) {