diff --git a/cli/command/context.go b/cli/command/context.go
index f6367c4a48..29a2be860f 100644
--- a/cli/command/context.go
+++ b/cli/command/context.go
@@ -58,5 +58,8 @@ func GetDockerContext(storeMetadata store.Metadata) (DockerContext, error) {
 	if !ok {
 		return DockerContext{}, errors.New("context metadata is not a valid DockerContext")
 	}
+	if storeMetadata.Name == DefaultContextName {
+		res.Description = "Current DOCKER_HOST based configuration"
+	}
 	return res, nil
 }
diff --git a/cli/command/context/list.go b/cli/command/context/list.go
index 9833581eed..d56ca8a7b1 100644
--- a/cli/command/context/list.go
+++ b/cli/command/context/list.go
@@ -59,9 +59,6 @@ func runList(dockerCli command.Cli, opts *listOptions) error {
 		if err != nil {
 			return err
 		}
-		if rawMeta.Name == command.DefaultContextName {
-			meta.Description = "Current DOCKER_HOST based configuration"
-		}
 		desc := formatter.ClientContext{
 			Name:           rawMeta.Name,
 			Current:        rawMeta.Name == curContext,