diff --git a/cli/config/config.go b/cli/config/config.go
index 09810782c3..c860cf7125 100644
--- a/cli/config/config.go
+++ b/cli/config/config.go
@@ -10,6 +10,7 @@ import (
 	"github.com/docker/cli/cli/config/configfile"
 	"github.com/docker/cli/cli/config/credentials"
 	"github.com/docker/cli/cli/config/types"
+	"github.com/docker/docker/pkg/homedir"
 	"github.com/pkg/errors"
 )
 
@@ -27,10 +28,7 @@ var (
 
 func init() {
 	if configDir == "" {
-		homedir, err := os.UserHomeDir()
-		if err == nil {
-			configDir = filepath.Join(homedir, configFileDir)
-		}
+		configDir = filepath.Join(homedir.Get(), configFileDir)
 	}
 }