diff --git a/src/commands/models/list.list-command.ts b/src/commands/models/list.list-command.ts
index e537be6d0b2..2c2450689c8 100644
--- a/src/commands/models/list.list-command.ts
+++ b/src/commands/models/list.list-command.ts
@@ -135,16 +135,17 @@ export async function modelsListCommand(
           return;
         }
         rows.length = 0;
+        const fallbackRegistry = modelRegistry as ModelRegistry | undefined;
         rowContext = buildRowContext(false);
         seenKeys = appendDiscoveredRows({
           rows,
-          models: modelRegistry?.getAll() ?? [],
+          models: fallbackRegistry?.getAll() ?? [],
           context: rowContext,
         });
-        if (modelRegistry) {
+        if (fallbackRegistry) {
           await appendCatalogSupplementRows({
             rows,
-            modelRegistry,
+            modelRegistry: fallbackRegistry,
             context: rowContext,
             seenKeys,
           });
diff --git a/src/commands/models/list.provider-catalog.test.ts b/src/commands/models/list.provider-catalog.test.ts
index e894c9ccbf2..9be6bd8d61b 100644
--- a/src/commands/models/list.provider-catalog.test.ts
+++ b/src/commands/models/list.provider-catalog.test.ts
@@ -162,7 +162,6 @@ describe("loadProviderCatalogModelsForList", () => {
       expect.objectContaining({
         onlyPluginIds: ["moonshot"],
         requireCompleteDiscoveryEntryCoverage: true,
-        discoveryEntriesOnly: true,
       }),
     );
   });
@@ -206,7 +205,6 @@ describe("loadProviderCatalogModelsForList", () => {
       expect.objectContaining({
         onlyPluginIds: ["ollama"],
         requireCompleteDiscoveryEntryCoverage: true,
-        discoveryEntriesOnly: true,
       }),
     );
   });
diff --git a/src/commands/models/list.provider-catalog.ts b/src/commands/models/list.provider-catalog.ts
index 815bd4caae7..b69fe2ea3ba 100644
--- a/src/commands/models/list.provider-catalog.ts
+++ b/src/commands/models/list.provider-catalog.ts
@@ -89,7 +89,6 @@ export async function hasProviderStaticCatalogForFilter(params: {
     onlyPluginIds: scopedPluginIds,
     includeUntrustedWorkspacePlugins: false,
     requireCompleteDiscoveryEntryCoverage: true,
-    discoveryEntriesOnly: true,
   });
   return providers.some(
     (provider) =>
@@ -159,7 +158,6 @@ export async function loadProviderCatalogModelsForList(params: {
       onlyPluginIds: scopedPluginIds,
       includeUntrustedWorkspacePlugins: false,
       requireCompleteDiscoveryEntryCoverage: params.staticOnly === true,
-      discoveryEntriesOnly: params.staticOnly === true,
     })
   ).filter(
     (provider) =>