diff --git a/ui/src/components/features/build-panel/components/create-assistant.tsx b/ui/src/components/features/build-panel/components/create-assistant.tsx
index 654e604..6ef2a3d 100644
--- a/ui/src/components/features/build-panel/components/create-assistant.tsx
+++ b/ui/src/components/features/build-panel/components/create-assistant.tsx
@@ -47,6 +47,7 @@ export function CreateAssistant() {
   const architectureType = form.watch("config.configurable.type");
   const tools = form.watch("config.configurable.tools");
 
+  // Only use config schema as defaults - don't use in edit
   const { systemMessage, retrievalDescription } = useConfigSchema(
     architectureType ?? "",
   );
diff --git a/ui/src/components/features/build-panel/components/edit-assistant.tsx b/ui/src/components/features/build-panel/components/edit-assistant.tsx
index 0242fc7..3cd0533 100644
--- a/ui/src/components/features/build-panel/components/edit-assistant.tsx
+++ b/ui/src/components/features/build-panel/components/edit-assistant.tsx
@@ -58,10 +58,6 @@ function EditAssistantForm({
 
   const { toast } = useToast();
 
-  const { systemMessage, retrievalDescription } = useConfigSchema(
-    architectureType ?? "",
-  );
-
   const { availableTools } = useAvailableTools();
 
   useEffect(() => {
@@ -70,18 +66,6 @@ function EditAssistantForm({
     }
   }, [selectedAssistant]);
 
-  useEffect(() => {
-    if (architectureType) {
-      // @ts-ignore
-      form.setValue("config.configurable.system_message", systemMessage);
-      form.setValue(
-        "config.configurable.retrieval_description",
-        // @ts-ignore
-        retrievalDescription,
-      );
-    }
-  }, [architectureType]);
-
   useEffect(() => {
     if (architectureType !== "agent") {
       // Set undefined agent_type if bot is not an agent
diff --git a/ui/src/components/features/build-panel/components/files-dialog.tsx b/ui/src/components/features/build-panel/components/files-dialog.tsx
index 0616802..1797570 100644
--- a/ui/src/components/features/build-panel/components/files-dialog.tsx
+++ b/ui/src/components/features/build-panel/components/files-dialog.tsx
@@ -194,7 +194,7 @@ export default function FilesDialog({ form, classNames }: TFilesDialog) {
             </Button>
           </DialogClose>
         </DialogFooter>
-      </DialogContent>
+``      </DialogContent>
     </Dialog>
   );
 }