diff --git a/app/components/settings.tsx b/app/components/settings.tsx
index a14f6473d..05c757771 100644
--- a/app/components/settings.tsx
+++ b/app/components/settings.tsx
@@ -423,6 +423,24 @@ export function Settings(props: { closeSettings: () => void }) {
             ></input>
           </SettingItem>
 
+          <SettingItem
+            title={Locale.Settings.RequestTimeOut.Title}
+            subTitle={Locale.Settings.RequestTimeOut.SubTitle}
+          >
+            <input
+              type="number"
+              min={1}
+              max={600}
+              value={config.requestTimeOut}
+              onChange={(e) =>
+                updateConfig(
+                  (config) =>
+                    (config.requestTimeOut = e.currentTarget.valueAsNumber),
+                )
+              }
+            ></input>
+          </SettingItem>
+
           <SettingItem
             title={Locale.Settings.CompressThreshold.Title}
             subTitle={Locale.Settings.CompressThreshold.SubTitle}
diff --git a/app/locales/cn.ts b/app/locales/cn.ts
index 033e1c2cf..8006205ab 100644
--- a/app/locales/cn.ts
+++ b/app/locales/cn.ts
@@ -102,6 +102,10 @@ const cn = {
       Title: "历史消息长度压缩阈值",
       SubTitle: "当未压缩的历史消息超过该值时，将进行压缩",
     },
+    RequestTimeOut: {
+      Title: "请求响应超时时间(单位/秒)",
+      SubTitle: "在设置时间内未获取响应将停止请求",
+    },
     Token: {
       Title: "API Key",
       SubTitle: "使用自己的 Key 可绕过密码访问限制",
diff --git a/app/locales/en.ts b/app/locales/en.ts
index aefc2e57c..74782239e 100644
--- a/app/locales/en.ts
+++ b/app/locales/en.ts
@@ -105,6 +105,11 @@ const en: LocaleType = {
       SubTitle:
         "Will compress if uncompressed messages length exceeds the value",
     },
+    RequestTimeOut: {
+      Title: "Request Response Timeout(unit/seconds)",
+      SubTitle:
+        "If no response is received within the set time, the request will be stopped",
+    },
     Token: {
       Title: "API Key",
       SubTitle: "Use your key to ignore access code limit",
diff --git a/app/locales/es.ts b/app/locales/es.ts
index 6997d5f6d..e78ee39cc 100644
--- a/app/locales/es.ts
+++ b/app/locales/es.ts
@@ -105,6 +105,11 @@ const es: LocaleType = {
       SubTitle:
         "Se comprimirán los mensajes si la longitud de los mensajes no comprimidos supera el valor",
     },
+    RequestTimeOut: {
+      Title: "Tiempo de espera de respuesta de solicitud(unidad/segundos)",
+      SubTitle:
+        "Si no se recibe respuesta dentro del tiempo establecido, la solicitud se detendrá",
+    },
     Token: {
       Title: "Clave de API",
       SubTitle: "Utiliza tu clave para ignorar el límite de código de acceso",
diff --git a/app/locales/it.ts b/app/locales/it.ts
index 95e6747ba..83bafdbfd 100644
--- a/app/locales/it.ts
+++ b/app/locales/it.ts
@@ -105,6 +105,11 @@ const it: LocaleType = {
       SubTitle:
         "Comprimerà se la lunghezza dei messaggi non compressi supera il valore",
     },
+    RequestTimeOut: {
+      Title: "Tempo limite di risposta della richiesta(unità/secondi)",
+      SubTitle:
+        "La richiesta si interromperà se non viene ricevuta risposta entro il tempo stabilito",
+    },
     Token: {
       Title: "Chiave API",
       SubTitle:
diff --git a/app/locales/tw.ts b/app/locales/tw.ts
index 4340fe2c8..1cb478e92 100644
--- a/app/locales/tw.ts
+++ b/app/locales/tw.ts
@@ -102,6 +102,10 @@ const tw: LocaleType = {
       Title: "歷史訊息長度壓縮閾值",
       SubTitle: "當未壓縮的歷史訊息超過該值時，將進行壓縮",
     },
+    RequestTimeOut: {
+      Title: "請求響應超時時間(單位/秒)",
+      SubTitle: "若在設定時間內未取得響應，將停止該請求",
+    },
     Token: {
       Title: "API Key",
       SubTitle: "使用自己的 Key 可規避授權訪問限制",
diff --git a/app/requests.ts b/app/requests.ts
index 8462f2694..b880171aa 100644
--- a/app/requests.ts
+++ b/app/requests.ts
@@ -2,8 +2,6 @@ import type { ChatRequest, ChatReponse } from "./api/openai/typing";
 import { Message, ModelConfig, useAccessStore, useChatStore } from "./store";
 import { showToast } from "./components/ui-lib";
 
-const TIME_OUT_MS = 30000;
-
 const makeRequestParam = (
   messages: Message[],
   options?: {
@@ -135,8 +133,10 @@ export async function requestChatStream(
   console.log("[Request] ", req);
 
   const controller = new AbortController();
-  const reqTimeoutId = setTimeout(() => controller.abort(), TIME_OUT_MS);
-
+  const reqTimeoutId = setTimeout(
+    () => controller.abort(),
+    useChatStore.getState().config.requestTimeOut * 1000,
+  );
   try {
     const res = await fetch("/api/chat-stream", {
       method: "POST",
@@ -165,7 +165,10 @@ export async function requestChatStream(
 
       while (true) {
         // handle time out, will stop if no response in 10 secs
-        const resTimeoutId = setTimeout(() => finish(), TIME_OUT_MS);
+        const resTimeoutId = setTimeout(
+          () => finish(),
+          useChatStore.getState().config.requestTimeOut * 1000,
+        );
         const content = await reader?.read();
         clearTimeout(resTimeoutId);
         const text = decoder.decode(content?.value);
diff --git a/app/store/app.ts b/app/store/app.ts
index c63fa9d4f..f59b25172 100644
--- a/app/store/app.ts
+++ b/app/store/app.ts
@@ -45,6 +45,7 @@ export enum Theme {
 export interface ChatConfig {
   historyMessageCount: number; // -1 means all
   compressMessageLengthThreshold: number;
+  requestTimeOut: number;
   sendBotMessages: boolean; // send bot's message or not
   submitKey: SubmitKey;
   avatar: string;
@@ -136,6 +137,7 @@ const DEFAULT_CONFIG: ChatConfig = {
   sendBotMessages: true as boolean,
   submitKey: SubmitKey.CtrlEnter as SubmitKey,
   avatar: "1f603",
+  requestTimeOut: 30,
   fontSize: 14,
   theme: Theme.Auto as Theme,
   tightBorder: false,