diff --git a/app/components/mcp-market.module.scss b/app/components/mcp-market.module.scss
index a3025c03e..46f3c3368 100644
--- a/app/components/mcp-market.module.scss
+++ b/app/components/mcp-market.module.scss
@@ -17,6 +17,27 @@
     padding: 20px;
     overflow-y: auto;
 
+    .loading-container,
+    .empty-container {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      min-height: 200px;
+      width: 100%;
+      background-color: var(--white);
+      border: var(--border-in-light);
+      border-radius: 10px;
+      animation: slide-in ease 0.3s;
+    }
+
+    .loading-text,
+    .empty-text {
+      font-size: 14px;
+      color: var(--black);
+      opacity: 0.5;
+      text-align: center;
+    }
+
     .mcp-market-filter {
       width: 100%;
       max-width: 100%;
diff --git a/app/components/mcp-market.tsx b/app/components/mcp-market.tsx
index 0e46e7766..bbf0d4d45 100644
--- a/app/components/mcp-market.tsx
+++ b/app/components/mcp-market.tsx
@@ -11,7 +11,6 @@ import GithubIcon from "../icons/github.svg";
 import { List, ListItem, Modal, showToast } from "./ui-lib";
 import { useNavigate } from "react-router-dom";
 import { useEffect, useState } from "react";
-import presetServersJson from "../mcp/preset-server.json";
 import {
   addMcpServer,
   getClientStatus,
@@ -32,8 +31,6 @@ import clsx from "clsx";
 import PlayIcon from "../icons/play.svg";
 import StopIcon from "../icons/pause.svg";
 
-const presetServers = presetServersJson as PresetServer[];
-
 interface ConfigProperty {
   type: string;
   description?: string;
@@ -53,6 +50,28 @@ export function McpMarketPage() {
   const [clientStatuses, setClientStatuses] = useState<
     Record<string, ServerStatusResponse>
   >({});
+  const [loadingPresets, setLoadingPresets] = useState(true);
+  const [presetServers, setPresetServers] = useState<PresetServer[]>([]);
+
+  useEffect(() => {
+    const loadPresetServers = async () => {
+      try {
+        setLoadingPresets(true);
+        const response = await fetch("https://nextchat.club/mcp/list");
+        if (!response.ok) {
+          throw new Error("Failed to load preset servers");
+        }
+        const data = await response.json();
+        setPresetServers(data?.data ?? []);
+      } catch (error) {
+        console.error("Failed to load preset servers:", error);
+        showToast("Failed to load preset servers");
+      } finally {
+        setLoadingPresets(false);
+      }
+    };
+    loadPresetServers().then();
+  }, []);
 
   // 检查服务器是否已添加
   const isServerAdded = (id: string) => {
@@ -440,6 +459,24 @@ export function McpMarketPage() {
 
   // 渲染服务器列表
   const renderServerList = () => {
+    if (loadingPresets) {
+      return (
+        <div className={styles["loading-container"]}>
+          <div className={styles["loading-text"]}>
+            Loading preset server list...
+          </div>
+        </div>
+      );
+    }
+
+    if (!Array.isArray(presetServers) || presetServers.length === 0) {
+      return (
+        <div className={styles["empty-container"]}>
+          <div className={styles["empty-text"]}>No servers available</div>
+        </div>
+      );
+    }
+
     return presetServers
       .filter((server) => {
         if (searchText.length === 0) return true;