diff --git a/ui/package-lock.json b/ui/package-lock.json
index d695cf41..638635b4 100644
--- a/ui/package-lock.json
+++ b/ui/package-lock.json
@@ -37,7 +37,7 @@
         "next-themes": "^0.4.6",
         "react": "^18.3.1",
         "react-dom": "^18.3.1",
-        "react-hook-form": "^7.58.1",
+        "react-hook-form": "^7.61.0",
         "react-markdown": "^9.1.0",
         "rehype-external-links": "^3.0.0",
         "remark-gfm": "^4.0.1",
@@ -13092,9 +13092,10 @@
       }
     },
     "node_modules/react-hook-form": {
-      "version": "7.58.1",
-      "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.58.1.tgz",
-      "integrity": "sha512-Lml/KZYEEFfPhUVgE0RdCVpnC4yhW+PndRhbiTtdvSlQTL8IfVR+iQkBjLIvmmc6+GGoVeM11z37ktKFPAb0FA==",
+      "version": "7.61.0",
+      "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.61.0.tgz",
+      "integrity": "sha512-o8S/HcCeuaAQVib36fPCgOLaaQN/v7Anj8zlYjcLMcz+4FnNfMsoDAEvVCefLb3KDnS43wq3pwcifehhkwowuQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=18.0.0"
       },
diff --git a/ui/package.json b/ui/package.json
index 9b942308..e299f18f 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -40,7 +40,7 @@
     "next-themes": "^0.4.6",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "react-hook-form": "^7.58.1",
+    "react-hook-form": "^7.61.0",
     "react-markdown": "^9.1.0",
     "rehype-external-links": "^3.0.0",
     "remark-gfm": "^4.0.1",
diff --git a/ui/src/components/onboarding/steps/ModelConfigStep.tsx b/ui/src/components/onboarding/steps/ModelConfigStep.tsx
index 12eda4a1..d8acb074 100644
--- a/ui/src/components/onboarding/steps/ModelConfigStep.tsx
+++ b/ui/src/components/onboarding/steps/ModelConfigStep.tsx
@@ -376,8 +376,8 @@ export function ModelConfigStep({
                                                                 const newTag = e.target.value.trim();
 
                                                                 const newAutoName = generateConfigName(
-                                                                    watchedProvider,
-                                                                    currentModelName,
+                                                                    watchedProvider || "",
+                                                                    currentModelName || "",
                                                                     newTag
                                                                 );