diff --git a/frontend/src/pages/WorkspaceSettings/AgentConfig/SQLConnectorSelection/DBConnection.jsx b/frontend/src/pages/WorkspaceSettings/AgentConfig/SQLConnectorSelection/DBConnection.jsx
index 7a58da45401fa220f5eaeb86aa8f88feb710dfc1..b2ff33bfc7f05488322c35df451cec6f11caf9f8 100644
--- a/frontend/src/pages/WorkspaceSettings/AgentConfig/SQLConnectorSelection/DBConnection.jsx
+++ b/frontend/src/pages/WorkspaceSettings/AgentConfig/SQLConnectorSelection/DBConnection.jsx
@@ -9,7 +9,7 @@ export const DB_LOGOS = {
   "sql-server": MSSQLLogo,
 };
 
-export default function DBConnection({ connection, onRemove }) {
+export default function DBConnection({ connection, onRemove, setHasChanges }) {
   const { database_id, engine } = connection;
   function removeConfirmation() {
     if (
@@ -20,6 +20,7 @@ export default function DBConnection({ connection, onRemove }) {
       return false;
     }
     onRemove(database_id);
+    setHasChanges(true);
   }
 
   return (
diff --git a/frontend/src/pages/WorkspaceSettings/AgentConfig/SQLConnectorSelection/index.jsx b/frontend/src/pages/WorkspaceSettings/AgentConfig/SQLConnectorSelection/index.jsx
index 9feb4b8bb6ce2ef651014ee60fb71b90b0cf96ee..848d44ed908ed3b0bac45305ef6a227246dbb944 100644
--- a/frontend/src/pages/WorkspaceSettings/AgentConfig/SQLConnectorSelection/index.jsx
+++ b/frontend/src/pages/WorkspaceSettings/AgentConfig/SQLConnectorSelection/index.jsx
@@ -9,6 +9,7 @@ export default function AgentSQLConnectorSelection({
   settings,
   toggleSkill,
   enabled = false,
+  setHasChanges,
 }) {
   const { isOpen, openModal, closeModal } = useModal();
   const [connections, setConnections] = useState(
@@ -72,6 +73,7 @@ export default function AgentSQLConnectorSelection({
                           })
                         );
                       }}
+                      setHasChanges={setHasChanges}
                     />
                   ))}
                 <button
diff --git a/frontend/src/pages/WorkspaceSettings/AgentConfig/index.jsx b/frontend/src/pages/WorkspaceSettings/AgentConfig/index.jsx
index 02065251a6622d1d4776485880d813efd01cb0be..9fb6f5d740ee14000b29fd108797c26d68b57eec 100644
--- a/frontend/src/pages/WorkspaceSettings/AgentConfig/index.jsx
+++ b/frontend/src/pages/WorkspaceSettings/AgentConfig/index.jsx
@@ -100,6 +100,7 @@ export default function WorkspaceAgentConfiguration({ workspace }) {
           skills={agentSkills}
           toggleAgentSkill={toggleAgentSkill}
           settings={settings}
+          setHasChanges={setHasChanges}
         />
         {hasChanges && (
           <button
@@ -143,7 +144,7 @@ function LoadingSkeleton() {
   );
 }
 
-function AvailableAgentSkills({ skills, settings, toggleAgentSkill }) {
+function AvailableAgentSkills({ skills, settings, toggleAgentSkill, setHasChanges }) {
   return (
     <div>
       <div className="flex flex-col mb-8">
@@ -211,6 +212,7 @@ function AvailableAgentSkills({ skills, settings, toggleAgentSkill }) {
           settings={settings}
           toggleSkill={toggleAgentSkill}
           enabled={skills.includes("sql-agent")}
+          setHasChanges={setHasChanges}
         />
       </div>
     </div>