diff --git a/apps/chat/src/store/conversations/conversations.epics.ts b/apps/chat/src/store/conversations/conversations.epics.ts
index 704e71a02..86cbc96fb 100644
--- a/apps/chat/src/store/conversations/conversations.epics.ts
+++ b/apps/chat/src/store/conversations/conversations.epics.ts
@@ -3018,12 +3018,14 @@ const applyMarketplaceModelEpic: AppEpic = (action$, state$) =>
               ConversationsActions.updateConversation({
                 id: conversation?.id as string,
                 values: {
-                  ...getConversationModelParams(
-                    conversation as Conversation,
-                    modelToApply?.reference,
-                    modelsMap,
-                    addonsMap,
-                  ),
+                  ...(conversation
+                    ? getConversationModelParams(
+                        conversation as Conversation,
+                        modelToApply?.reference,
+                        modelsMap,
+                        addonsMap,
+                      )
+                    : {}),
                 },
               }),
             ),
diff --git a/package.json b/package.json
index 3eb7ec05d..767c651ae 100644
--- a/package.json
+++ b/package.json
@@ -154,6 +154,7 @@
     "vitest": "^1.6.1"
   },
   "overrides": {
+    "cross-spawn": "7.0.6",
     "js-yaml": "4.1.0",
     "argparse": "2.0.1"
   },