diff --git a/pkg/action/install.go b/pkg/action/install.go
index f37808769..452e9ba44 100644
--- a/pkg/action/install.go
+++ b/pkg/action/install.go
@@ -266,11 +266,7 @@ func (i *Install) RunWithContext(ctx context.Context, chrt *chart.Chart, vals ma
 	rel := i.createRelease(chrt, vals)
 
 	var manifestDoc *bytes.Buffer
-	// Determines whether `helm template` was used or another command with the --dry-run flag
-	// as they both set the Install.DryRun field to `true`. The `--dry-run` flag should be able
-	// to connect to remote for the lookup function. `helm template` is the only command that
-	// Install.APIVersions field will not be nil.
-	interactWithRemote := !i.DryRun || i.APIVersions == nil
+	interactWithRemote := i.DryRunMode == DryRunModeServer
 	rel.Hooks, manifestDoc, rel.Info.Notes, err = i.cfg.renderResources(chrt, valuesToRender, i.ReleaseName, i.OutputDir, i.SubNotes, i.UseReleaseName, i.IncludeCRDs, i.PostRenderer, interactWithRemote)
 	// Even for errors, attach this if available
 	if manifestDoc != nil {