diff --git a/core/src/garden.ts b/core/src/garden.ts
index b3ef91d68e..e1eb3c22ae 100644
--- a/core/src/garden.ts
+++ b/core/src/garden.ts
@@ -1673,6 +1673,8 @@ export class Garden {
     resolveProviders?: boolean
     resolveWorkflows?: boolean
   }): Promise<ConfigDump> {
+    let providers: ConfigDump["providers"] = []
+    let suggestedCommands: SuggestedCommand[] = []
     let moduleConfigs: ModuleConfig[]
     let workflowConfigs: WorkflowConfig[]
     let actionConfigs: ActionConfigMap = {
@@ -1683,8 +1685,13 @@ export class Garden {
     }
 
     await this.scanAndAddConfigs()
-
-    const providers = Object.values(await this.resolveProviders(log, { noInit: !resolveProviders }))
+    if (resolveProviders) {
+      const resolvedProviders = Object.values(await this.resolveProviders(log))
+      suggestedCommands = await this.getSuggestedCommands(log, resolvedProviders)
+      providers = resolvedProviders
+    } else {
+      providers = this.getRawProviderConfigs()
+    }
 
     if (!graph && resolveGraph) {
       graph = await this.getResolvedConfigGraph({ log, emit: false })
@@ -1726,7 +1733,7 @@ export class Garden {
       projectId: this.projectId,
       domain: this.cloudDomain,
       sources: this.projectSources,
-      suggestedCommands: await this.getSuggestedCommands(log, providers),
+      suggestedCommands,
     }
   }