diff --git a/gui/src/pages/config/sections/ToolsSection.tsx b/gui/src/pages/config/sections/ToolsSection.tsx
index a48bd5df7ac..7984548b0e4 100644
--- a/gui/src/pages/config/sections/ToolsSection.tsx
+++ b/gui/src/pages/config/sections/ToolsSection.tsx
@@ -160,7 +160,8 @@ function MCPServerPreview({
     sectionKey: string;
   }) => {
     const isExpanded = expandedSections[sectionKey];
-    const hasItems = items.length > 0;
+    const safeItems = Array.isArray(items) ? items : [];
+    const hasItems = safeItems.length > 0;
 
     return (
       <div>
@@ -176,7 +177,7 @@ function MCPServerPreview({
               {icon}
               <span className="text-sm">{title}</span>
               <div className="flex h-5 w-5 items-center justify-center rounded-md bg-gray-600 px-0.5 text-xs font-medium text-white">
-                {items.length}
+                {safeItems.length}
               </div>
             </div>
           </div>
@@ -186,14 +187,14 @@ function MCPServerPreview({
           <div className="mx-2 my-2 mb-3">
             {hasItems ? (
               <div className="space-y-1">
-                {items.map((item, idx) => {
+                {safeItems.map((item, idx) => {
                   return (
                     <div
                       key={idx}
                       className="text-description rounded bg-gray-50 bg-opacity-5 px-2 py-1 text-xs"
                     >
-                      <code>{item.name}</code>
-                      {item.description && (
+                      <code>{item?.name ?? "Unknown"}</code>
+                      {item?.description && (
                         <div className="mt-1 text-xs text-gray-500">
                           {item.description}
                         </div>
@@ -337,7 +338,7 @@ function MCPServerPreview({
           allToolsOff={allToolsOff}
           duplicateDetection={duplicateDetection}
         />
-        {server.prompts.length > 0 && (
+        {Array.isArray(server.prompts) && server.prompts.length > 0 && (
           <ResourceRow
             title="Prompts"
             items={server.prompts}
@@ -347,17 +348,21 @@ function MCPServerPreview({
             sectionKey={`${server.id}-prompts`}
           />
         )}
-        {(server.resources.length > 0 ||
-          server.resourceTemplates.length > 0) && (
+        {(Array.isArray(server.resources) && server.resources.length > 0) ||
+        (Array.isArray(server.resourceTemplates) &&
+          server.resourceTemplates.length > 0) ? (
           <ResourceRow
             title="Resources"
-            items={[...server.resources, ...server.resourceTemplates]}
+            items={[
+              ...(server.resources ?? []),
+              ...(server.resourceTemplates ?? []),
+            ]}
             icon={
               <CircleStackIcon className="text-description h-4 w-4 flex-shrink-0" />
             }
             sectionKey={`${server.id}-resources`}
           />
-        )}
+        ) : null}
       </div>
 
       {/* Error display below expandable section */}
@@ -447,10 +452,26 @@ export function ToolsSection() {
         .map((server) => [server.name, server]) ?? [],
     );
 
-    return (servers ?? []).map((doc: MCPServerStatus) => ({
-      block: doc,
-      blockFromYaml: yamlServersByName.get(doc.name),
-    }));
+    // Filter out any invalid servers and ensure they have required properties
+    return (servers ?? [])
+      .filter((doc: MCPServerStatus) => {
+        // Ensure server has required properties to prevent render issues
+        return (
+          doc &&
+          typeof doc.id === "string" &&
+          typeof doc.name === "string" &&
+          doc.name.length > 0 &&
+          Array.isArray(doc.prompts) &&
+          Array.isArray(doc.resources) &&
+          Array.isArray(doc.resourceTemplates) &&
+          Array.isArray(doc.errors) &&
+          Array.isArray(doc.infos)
+        );
+      })
+      .map((doc: MCPServerStatus) => ({
+        block: doc,
+        blockFromYaml: yamlServersByName.get(doc.name),
+      }));
   }, [servers, selectedProfile]);
 
   const handleAddMcpServer = () => {
@@ -524,7 +545,7 @@ export function ToolsSection() {
             {mergedBlocks.length > 0 ? (
               mergedBlocks.map(({ block, blockFromYaml }) => (
                 <MCPServerPreview
-                  key={block.name}
+                  key={block.id || block.name}
                   server={block}
                   serverFromYaml={blockFromYaml}
                   allToolsOff={allToolsOff}
diff --git a/gui/src/redux/slices/configSlice.ts b/gui/src/redux/slices/configSlice.ts
index 67835465530..58a2d9fc579 100644
--- a/gui/src/redux/slices/configSlice.ts
+++ b/gui/src/redux/slices/configSlice.ts
@@ -36,6 +36,36 @@ export const EMPTY_CONFIG: BrowserSerializedContinueConfig = {
   rules: [],
 };
 
+/**
+ * Sanitizes MCP server statuses to ensure they have valid properties
+ * and prevent rendering issues from corrupted/incomplete data.
+ */
+function sanitizeMcpServerStatuses(
+  statuses: any[],
+): BrowserSerializedContinueConfig["mcpServerStatuses"] {
+  if (!Array.isArray(statuses)) {
+    return [];
+  }
+
+  return statuses.filter((server) => {
+    // Filter out invalid servers that could cause render loops
+    return (
+      server &&
+      typeof server === "object" &&
+      typeof server.id === "string" &&
+      server.id.length > 0 &&
+      typeof server.name === "string" &&
+      server.name.length > 0 &&
+      // Ensure arrays exist even if empty
+      Array.isArray(server.prompts) &&
+      Array.isArray(server.resources) &&
+      Array.isArray(server.resourceTemplates) &&
+      Array.isArray(server.errors) &&
+      Array.isArray(server.infos)
+    );
+  });
+}
+
 export const INITIAL_CONFIG_SLICE: ConfigState = {
   configError: undefined,
   config: EMPTY_CONFIG,
@@ -66,7 +96,13 @@ export const configSlice = createSlice({
       if (!config) {
         state.config = EMPTY_CONFIG;
       } else {
-        state.config = config;
+        // Sanitize MCP server statuses to prevent render issues
+        state.config = {
+          ...config,
+          mcpServerStatuses: sanitizeMcpServerStatuses(
+            config.mcpServerStatuses,
+          ),
+        };
       }
       state.loading = false;
     },
@@ -74,7 +110,11 @@ export const configSlice = createSlice({
       state,
       { payload: config }: PayloadAction<BrowserSerializedContinueConfig>,
     ) => {
-      state.config = config;
+      // Sanitize MCP server statuses when updating config
+      state.config = {
+        ...config,
+        mcpServerStatuses: sanitizeMcpServerStatuses(config.mcpServerStatuses),
+      };
     },
     setConfigLoading: (state, { payload: loading }: PayloadAction<boolean>) => {
       state.loading = loading;