diff --git a/frontend/src/pages/WorkspaceSettings/AgentConfig/AgentLLMSelection/AgentLLMItem/index.jsx b/frontend/src/pages/WorkspaceSettings/AgentConfig/AgentLLMSelection/AgentLLMItem/index.jsx
index 02be032dc706058f2687342083c20f151e459b7a..3dc8953c4f7bb702fb981da3fc297a94d75171af 100644
--- a/frontend/src/pages/WorkspaceSettings/AgentConfig/AgentLLMSelection/AgentLLMItem/index.jsx
+++ b/frontend/src/pages/WorkspaceSettings/AgentConfig/AgentLLMSelection/AgentLLMItem/index.jsx
@@ -9,6 +9,7 @@ import System from "@/models/system";
 import showToast from "@/utils/toast";
 import { useEffect, useState } from "react";
 
+const NO_SETTINGS_NEEDED = ["default", "none"];
 export default function AgentLLMItem({
   llm,
   availableLLMs,
@@ -73,18 +74,20 @@ export default function AgentLLMItem({
               <div className="mt-1 text-xs text-white/60">{description}</div>
             </div>
           </div>
-          {checked && value !== "none" && (
-            <button
-              onClick={(e) => {
-                e.preventDefault();
-                openModal();
-              }}
-              className="p-2 text-white/60 hover:text-white hover:bg-theme-bg-hover rounded-md transition-all duration-300"
-              title="Edit Settings"
-            >
-              <Gear size={20} weight="bold" />
-            </button>
-          )}
+          {checked &&
+            value !== "none" &&
+            !NO_SETTINGS_NEEDED.includes(value) && (
+              <button
+                onClick={(e) => {
+                  e.preventDefault();
+                  openModal();
+                }}
+                className="border-none p-2 text-white/60 hover:text-white hover:bg-theme-bg-hover rounded-md transition-all duration-300"
+                title="Edit Settings"
+              >
+                <Gear size={20} weight="bold" />
+              </button>
+            )}
         </div>
       </div>
       <SetupProvider
diff --git a/frontend/src/pages/WorkspaceSettings/AgentConfig/AgentLLMSelection/index.jsx b/frontend/src/pages/WorkspaceSettings/AgentConfig/AgentLLMSelection/index.jsx
index effc7b7448bf381efcacda306faa40a8771975ea..ca936a8318e7038a0e4471c9a745f17725810377 100644
--- a/frontend/src/pages/WorkspaceSettings/AgentConfig/AgentLLMSelection/index.jsx
+++ b/frontend/src/pages/WorkspaceSettings/AgentConfig/AgentLLMSelection/index.jsx
@@ -48,11 +48,12 @@ const WARN_PERFORMANCE = [
 ];
 
 const LLM_DEFAULT = {
-  name: "Please make a selection",
+  name: "System Default",
   value: "none",
   logo: AnythingLLMIcon,
   options: () => <React.Fragment />,
-  description: "Agents will not work until a valid selection is made.",
+  description:
+    "Agents will use the workspace or system LLM unless otherwise specified.",
   requiredConfig: [],
 };
 
diff --git a/frontend/src/pages/WorkspaceSettings/ChatSettings/WorkspaceLLMSelection/WorkspaceLLMItem/index.jsx b/frontend/src/pages/WorkspaceSettings/ChatSettings/WorkspaceLLMSelection/WorkspaceLLMItem/index.jsx
index ee123556c073fdf8237a7ee8e34b91fe3a2dfc1f..9c5e06fce4a85ecbbaafdf2d6f67e6b3a1e89ca7 100644
--- a/frontend/src/pages/WorkspaceSettings/ChatSettings/WorkspaceLLMSelection/WorkspaceLLMItem/index.jsx
+++ b/frontend/src/pages/WorkspaceSettings/ChatSettings/WorkspaceLLMSelection/WorkspaceLLMItem/index.jsx
@@ -9,6 +9,7 @@ import System from "@/models/system";
 import showToast from "@/utils/toast";
 import { useEffect, useState } from "react";
 
+const NO_SETTINGS_NEEDED = ["default"];
 export default function WorkspaceLLM({
   llm,
   availableLLMs,
@@ -73,7 +74,7 @@ export default function WorkspaceLLM({
               <div className="mt-1 text-xs text-white/60">{description}</div>
             </div>
           </div>
-          {checked && (
+          {checked && !NO_SETTINGS_NEEDED.includes(value) && (
             <button
               onClick={(e) => {
                 e.preventDefault();