diff --git a/app/utils/model.ts b/app/utils/model.ts
index a0b0d6b65..cc924f40f 100644
--- a/app/utils/model.ts
+++ b/app/utils/model.ts
@@ -99,13 +99,25 @@ export function collectModelTableWithDefaultModel(
 ) {
   let modelTable = collectModelTable(models, customModels);
   if (defaultModel && defaultModel !== "") {
-    modelTable[defaultModel] = {
-      ...modelTable[defaultModel],
-      name: modelTable[defaultModel]?.name ?? defaultModel,
-      displayName: modelTable[defaultModel]?.displayName ?? defaultModel,
-      available: true,
-      isDefault: true,
-    };
+    const [modelName, providerName] = defaultModel.split("@");
+    if (providerName && providerName != "") {
+      modelTable[defaultModel] = {
+        ...modelTable[defaultModel],
+        name: modelTable[defaultModel]?.name ?? modelName,
+        displayName:
+          modelTable[defaultModel]?.displayName ??
+          modelName + "(" + providerName + ")",
+        available: true,
+        isDefault: true,
+      };
+    } else {
+      for (const key of Object.keys(modelTable)) {
+        if (modelTable[key].available && key.startsWith(modelName)) {
+          modelTable[key].isDefault = true;
+          break;
+        }
+      }
+    }
   }
   return modelTable;
 }