diff --git a/src/app/assistants/[id]/chat/useChatContext.ts b/src/app/assistants/[id]/chat/useChatContext.ts
index fc1ef4c..cd2cfa1 100644
--- a/src/app/assistants/[id]/chat/useChatContext.ts
+++ b/src/app/assistants/[id]/chat/useChatContext.ts
@@ -32,7 +32,7 @@ export const useChatContext = () => {
   useEffect(() => {
     if (reset) {
       let initialPrompt = getInitialPrompt(assistant);
-      let initialMessages:any = [];
+      let initialMessages: any = [];
 
       // Hide the initial prompt if there is none set
       if (initialPrompt && initialPrompt.trim()) {
diff --git a/src/app/assistants/[id]/customize/DebounceInputWithActions.tsx b/src/app/assistants/[id]/customize/DebounceInputWithActions.tsx
index b5c8cc3..d163cb4 100644
--- a/src/app/assistants/[id]/customize/DebounceInputWithActions.tsx
+++ b/src/app/assistants/[id]/customize/DebounceInputWithActions.tsx
@@ -7,7 +7,7 @@ export interface DebouncedInputWithActionsProps {
   value?: string;
   placeholder?: string;
   onDebounceTextChange?: (text: string) => void;
-  onDebounceTextDelete?: (text: string) => void;
+  onDebounceTextDelete?: () => void;
 }
 
 export const DebouncedInputWithActions: React.FC<
diff --git a/src/app/assistants/[id]/customize/EditConversationStarters.tsx b/src/app/assistants/[id]/customize/EditConversationStarters.tsx
index 3021e18..83ff5e7 100644
--- a/src/app/assistants/[id]/customize/EditConversationStarters.tsx
+++ b/src/app/assistants/[id]/customize/EditConversationStarters.tsx
@@ -1,23 +1,18 @@
 import { Button, Label, Modal, TextInput } from 'flowbite-react';
 import React, { useContext, useEffect, useState } from 'react';
-import DebouncedInput from '@/app/assistants/[id]/customize/DebounceInput';
 import { getInitialConversationStarter } from '@/app/utils/assistant';
 import AssistantContext from '@/app/assistants/[id]/AssistantContext';
 import { ulid } from 'ulidx';
 import { HiCheck, HiPlus, HiTrash } from 'react-icons/hi';
 import DebouncedInputWithActions from '@/app/assistants/[id]/customize/DebounceInputWithActions';
-
-export interface ConversationStarter {
-  id: string;
-  prompt: string;
-}
+import { ConversationStarter } from '@/app/types/assistant';
 
 export const EditConversationStarters: React.FC = () => {
   const { assistant, setAssistant } = useContext(AssistantContext);
 
   const [conversationStarters, setConversationStarters] = useState<
     ConversationStarter[]
-  >([]);
+  >(getInitialConversationStarter(assistant));
   const [saveConversationStarter, setSaveConversationStarter] =
     useState<ConversationStarter | null>(null);
   const [dirtyConversationStarter, setdirtyConversationStarter] =
@@ -28,8 +23,14 @@ export const EditConversationStarters: React.FC = () => {
     useState<ConversationStarter | null>(null);
 
   useEffect(() => {
-    console.log('changed');
-    console.log(conversationStarters);
+    // Save it to the assistant
+    setAssistant({
+      ...assistant,
+      theme: {
+        ...assistant.theme,
+        conversationStarters: conversationStarters,
+      },
+    });
   }, [conversationStarters]);
 
   useEffect(() => {}, [dirtyConversationStarter]);
@@ -38,14 +39,13 @@ export const EditConversationStarters: React.FC = () => {
 
   useEffect(() => {
     if (deleteConversationStarter) {
-      // TODO: Remove through API
       const indexToRemove = conversationStarters.findIndex(
         (key) => key.id === deleteConversationStarter.id
       );
       if (indexToRemove !== -1) {
         conversationStarters.splice(indexToRemove, 1);
       }
-      setConversationStarters(conversationStarters);
+      setConversationStarters([...conversationStarters]);
       setDeleteConversationStarter(null);
     }
   }, [deleteConversationStarter]);
@@ -57,16 +57,19 @@ export const EditConversationStarters: React.FC = () => {
     ]);
   };
 
-  const handleSaveConversationStarter = function () {};
+  const handleSaveConversationStarter = function (id: string, text: string) {
+    conversationStarters.forEach((starter) => {
+      if (starter.id === id) {
+        starter.prompt = text;
+      }
+    });
 
-  const onConversationStarterChange = function (event: any) {
-    conversationStarters.forEach((iterationConversationStarter) => {});
+    setConversationStarters([...conversationStarters]);
   };
 
   const handleDeleteConversationStarter = function (id: string) {
     conversationStarters.forEach((iterationConversationStarter) => {
       if (iterationConversationStarter.id === id) {
-        console.log(iterationConversationStarter);
         setDeleteConversationStarter(iterationConversationStarter);
       }
     });
@@ -83,7 +86,9 @@ export const EditConversationStarters: React.FC = () => {
             <div key={index} className={'overflow-y-auto'}>
               <div className='gap-2 pt-5'>
                 <DebouncedInputWithActions
-                  onDebounceTextChange={onConversationStarterChange as any}
+                  onDebounceTextChange={(text) =>
+                    handleSaveConversationStarter(starter.id, text)
+                  }
                   onDebounceTextDelete={() => {
                     handleDeleteConversationStarter(starter.id);
                   }}
diff --git a/src/app/types/assistant.ts b/src/app/types/assistant.ts
index 64943ce..00df62d 100644
--- a/src/app/types/assistant.ts
+++ b/src/app/types/assistant.ts
@@ -2,6 +2,11 @@ export interface Tool {
   type: string;
 }
 
+export interface ConversationStarter {
+  id: string;
+  prompt: string;
+}
+
 export interface AssistantTheme {
   primaryColor?: string;
   secondaryColor?: string;
@@ -9,7 +14,7 @@ export interface AssistantTheme {
   secondaryTextColor?: string;
   initialPrompt?: string;
   messageLabel?: string;
-  conversationStarters?: string[];
+  conversationStarters?: ConversationStarter[];
 }
 
 export interface Assistant {