diff --git a/web-app/src/hooks/useModelProvider.ts b/web-app/src/hooks/useModelProvider.ts
index 75c8bc4ba..9e48d2653 100644
--- a/web-app/src/hooks/useModelProvider.ts
+++ b/web-app/src/hooks/useModelProvider.ts
@@ -55,7 +55,7 @@ export const useModelProvider = create<ModelProviderState>()(
               }),
               api_key: existingProvider?.api_key || provider.api_key,
               base_url: existingProvider?.base_url || provider.base_url,
-              active: existingProvider?.active || true,
+              active: existingProvider ? existingProvider?.active : false,
             }
           })
 
diff --git a/web-app/src/services/threads.ts b/web-app/src/services/threads.ts
index e50692b2d..52e6ea283 100644
--- a/web-app/src/services/threads.ts
+++ b/web-app/src/services/threads.ts
@@ -48,12 +48,11 @@ export const createThread = async (thread: Thread): Promise<Thread> => {
         ...thread,
         assistants: [
           {
+            ...(thread.assistants?.[0] ?? defaultAssistant),
             model: {
               id: thread.model?.id ?? '*',
               engine: thread.model?.provider ?? 'llama.cpp',
             },
-            id: 'jan',
-            name: 'Jan',
           },
         ],
         metadata: {