diff --git a/src/chatgpt.ts b/src/chatgpt.ts
index d41705d..67cb57e 100644
--- a/src/chatgpt.ts
+++ b/src/chatgpt.ts
@@ -162,7 +162,9 @@ class Chat {
   top_p: number;
   enable_top_p: boolean;
   presence_penalty: number;
+  presence_penalty_enabled: boolean;
   frequency_penalty: number;
+  frequency_penalty_enabled: boolean;
   json_mode: boolean;
 
   constructor(
@@ -181,7 +183,9 @@ class Chat {
       top_p = 1,
       enable_top_p = false,
       presence_penalty = 0,
+      presence_penalty_enabled = false,
       frequency_penalty = 0,
+      frequency_penalty_enabled = false,
       json_mode = false,
     } = {}
   ) {
@@ -201,7 +205,9 @@ class Chat {
     this.top_p = top_p;
     this.enable_top_p = enable_top_p;
     this.presence_penalty = presence_penalty;
+    this.presence_penalty_enabled = presence_penalty_enabled
     this.frequency_penalty = frequency_penalty;
+    this.frequency_penalty_enabled = frequency_penalty_enabled;
     this.json_mode = json_mode;
   }
 
@@ -239,8 +245,6 @@ class Chat {
       model: this.model,
       messages,
       stream,
-      presence_penalty: this.presence_penalty,
-      frequency_penalty: this.frequency_penalty,
     };
     if (stream) {
       body["stream_options"] = {
@@ -256,6 +260,12 @@ class Chat {
     if (this.enable_max_gen_tokens) {
       body["max_tokens"] = this.max_gen_tokens;
     }
+    if (this.presence_penalty_enabled) {
+      body["presence_penalty"] = this.presence_penalty;
+    }
+    if (this.frequency_penalty_enabled) {
+      body["frequency_penalty"] = this.frequency_penalty;
+    }
     if (this.json_mode) {
       body["response_format"] = {
         type: "json_object",
diff --git a/src/pages/Chatbox.tsx b/src/pages/Chatbox.tsx
index 9a4bb29..20fec3e 100644
--- a/src/pages/Chatbox.tsx
+++ b/src/pages/Chatbox.tsx
@@ -238,7 +238,9 @@ export default function ChatBOX() {
     client.top_p = chatStore.top_p;
     client.enable_top_p = chatStore.top_p_enabled;
     client.frequency_penalty = chatStore.frequency_penalty;
+    client.frequency_penalty_enabled = chatStore.frequency_penalty_enabled;
     client.presence_penalty = chatStore.presence_penalty;
+    client.presence_penalty_enabled = chatStore.presence_penalty_enabled;
     client.json_mode = chatStore.json_mode;
     client.messages = chatStore.history
       // only copy non hidden message