diff --git a/src/lib/components/workspace/Models/BuiltinTools.svelte b/src/lib/components/workspace/Models/BuiltinTools.svelte
index 63bb56bb5c..c6fc2f4bea 100644
--- a/src/lib/components/workspace/Models/BuiltinTools.svelte
+++ b/src/lib/components/workspace/Models/BuiltinTools.svelte
@@ -86,12 +86,12 @@
 	$: enabledTools = allTools.filter((key) => builtinTools[key] !== false);
 
 	const setBuiltinTool = (tool: keyof typeof toolLabels, checked: boolean) => {
+		builtinTools = { ...builtinTools };
 		if (checked) {
 			delete builtinTools[tool];
 		} else {
 			builtinTools[tool] = false;
 		}
-		builtinTools = builtinTools;
 	};
 </script>
 
diff --git a/src/lib/components/workspace/Models/ModelEditor.svelte b/src/lib/components/workspace/Models/ModelEditor.svelte
index 3485504a64..5c9237ee68 100644
--- a/src/lib/components/workspace/Models/ModelEditor.svelte
+++ b/src/lib/components/workspace/Models/ModelEditor.svelte
@@ -458,7 +458,10 @@
 			}
 		}
 
-		if (Object.keys(builtinTools).length > 0) {
+		if (
+			Object.keys(builtinTools).length > 0 ||
+			Object.keys(defaultMeta.builtinTools ?? {}).length > 0
+		) {
 			modelInfo.meta.builtinTools = builtinTools;
 		} else {
 			if (modelInfo.meta.builtinTools) {