diff --git a/lib/user-interface/react/src/components/chatbot/Chat.tsx b/lib/user-interface/react/src/components/chatbot/Chat.tsx
index 3eb52d37..a906eb60 100644
--- a/lib/user-interface/react/src/components/chatbot/Chat.tsx
+++ b/lib/user-interface/react/src/components/chatbot/Chat.tsx
@@ -287,12 +287,6 @@ export default function Chat({ sessionId }) {
       },
       streaming,
       maxTokens: modelConfig?.max_tokens,
-      n: modelConfig?.n,
-      topP: modelConfig?.top_p,
-      frequencyPenalty: modelConfig?.frequency_penalty,
-      presencePenalty: modelConfig?.presence_penalty,
-      temperature: modelConfig?.temperature,
-      stop: modelConfig?.stop,
       modelKwargs: modelConfig?.modelKwargs,
     });
   };
diff --git a/lib/user-interface/react/src/components/chatbot/ModelKwargs.tsx b/lib/user-interface/react/src/components/chatbot/ModelKwargs.tsx
index ef001924..cb086f41 100644
--- a/lib/user-interface/react/src/components/chatbot/ModelKwargs.tsx
+++ b/lib/user-interface/react/src/components/chatbot/ModelKwargs.tsx
@@ -44,19 +44,19 @@ export default function ModelKwargsEditor({ setModelConfig, visible, setVisible
   useEffect(() => {
     const modelConfig: ModelConfig = {
       max_tokens: maxNewTokens,
-      n: n,
-      top_p: topP,
-      frequency_penalty: frequencyPenalty,
-      presence_penalty: presencePenalty,
-      temperature: temperature,
-      stop: stopSequences.map((elem) => {
-        try {
-          return unraw(elem);
-        } catch (error) {
-          return elem;
-        }
-      }),
       modelKwargs: {
+        n: n,
+        top_p: topP,
+        frequency_penalty: frequencyPenalty,
+        presence_penalty: presencePenalty,
+        temperature: temperature,
+        stop: stopSequences.map((elem) => {
+          try {
+            return unraw(elem);
+          } catch (error) {
+            return elem;
+          }
+        }),
         seed,
       },
     };
@@ -96,7 +96,7 @@ export default function ModelKwargsEditor({ setModelConfig, visible, setVisible
         </FormField>
         <FormField
           label="n"
-          constraintText="Must be greater than or equal to 1 - Defaults to 1 if not specified."
+          constraintText="Must be greater than or equal to 1 - Defaults to null if not specified."
           description="How many completions to generate for each prompt."
         >
           <Input
@@ -142,7 +142,7 @@ export default function ModelKwargsEditor({ setModelConfig, visible, setVisible
         </FormField>
         <FormField
           label="frequency_penalty"
-          constraintText="Must be between -2.0 and 2.0 - Defaults to 0 if not specified."
+          constraintText="Must be between -2.0 and 2.0 - Defaults to null if not specified."
           description="Number between -2.0 and 2.0. Positive values
                     penalize new tokens based on their existing
                     frequency in the text so far, decreasing the model's
@@ -166,7 +166,7 @@ export default function ModelKwargsEditor({ setModelConfig, visible, setVisible
         </FormField>
         <FormField
           label="presence_penalty"
-          constraintText="Must be between -2.0 and 2.0 - Defaults to 0 if not specified."
+          constraintText="Must be between -2.0 and 2.0 - Defaults to null if not specified."
           description="Number between -2.0 and 2.0. Positive values
                       penalize new tokens based on whether they appear
                       in the text so far, increasing the model's
@@ -190,7 +190,7 @@ export default function ModelKwargsEditor({ setModelConfig, visible, setVisible
         </FormField>
         <FormField
           label="temperature"
-          constraintText="Must be between 0 and 2.0 - Defaults to 1 if not specified."
+          constraintText="Must be between 0 and 2.0 - Defaults to null if not specified."
           description="What sampling temperature to use, between 0 and 2.
                   Higher values like 0.8 will make the output more random,
                   while lower values like 0.2 will make it more focused
diff --git a/lib/user-interface/react/src/components/types.tsx b/lib/user-interface/react/src/components/types.tsx
index 979ac513..89c6001a 100644
--- a/lib/user-interface/react/src/components/types.tsx
+++ b/lib/user-interface/react/src/components/types.tsx
@@ -21,12 +21,6 @@ import { BaseMessage, BaseMessageFields, MessageContent, MessageType } from '@la
  */
 export type ModelConfig = {
   max_tokens?: number;
-  n?: number | null;
-  top_p?: number | null;
-  frequency_penalty?: number | null;
-  presence_penalty?: number | null;
-  temperature?: number | null;
-  stop: string[];
   modelKwargs?: ModelArgs;
 };
 
@@ -34,6 +28,12 @@ export type ModelConfig = {
  * Used to specify additional parameters in how the LLM processes inputs
  */
 export type ModelArgs = {
+  n?: number | null;
+  top_p?: number | null;
+  frequency_penalty?: number | null;
+  presence_penalty?: number | null;
+  temperature?: number | null;
+  stop: string[];
   seed?: number | null;
 };