diff --git a/cli/command/cli.go b/cli/command/cli.go
index 103184d4de..cfa43921b3 100644
--- a/cli/command/cli.go
+++ b/cli/command/cli.go
@@ -422,12 +422,13 @@ type ClientInfo struct {
 // It applies by default the standard streams, and the content trust from
 // environment.
 func NewDockerCli(ops ...DockerCliOption) (*DockerCli, error) {
-	cli := &DockerCli{}
 	defaultOps := []DockerCliOption{
 		WithContentTrustFromEnv(),
+		WithDefaultContextStoreConfig(),
 	}
-	cli.contextStoreConfig = DefaultContextStoreConfig()
 	ops = append(defaultOps, ops...)
+
+	cli := &DockerCli{}
 	if err := cli.Apply(ops...); err != nil {
 		return nil, err
 	}
diff --git a/cli/command/cli_options.go b/cli/command/cli_options.go
index 290cae45c3..cd81794982 100644
--- a/cli/command/cli_options.go
+++ b/cli/command/cli_options.go
@@ -94,3 +94,11 @@ func WithContextEndpointType(endpointName string, endpointType store.TypeGetter)
 		return nil
 	}
 }
+
+// WithDefaultContextStoreConfig configures the cli to use the default context store configuration.
+func WithDefaultContextStoreConfig() DockerCliOption {
+	return func(cli *DockerCli) error {
+		cli.contextStoreConfig = DefaultContextStoreConfig()
+		return nil
+	}
+}