diff --git a/client/config.go b/client/config.go
index 675a35296a..ce57434a57 100644
--- a/client/config.go
+++ b/client/config.go
@@ -9,8 +9,6 @@ import (
 
 	"github.com/tendermint/tendermint/libs/cli"
 
-	"github.com/cosmos/cosmos-sdk/cmd/gaia/app"
-
 	"github.com/pelletier/go-toml"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
@@ -32,7 +30,7 @@ func init() {
 
 // ConfigCmd returns a CLI command to interactively create a
 // Gaia CLI config file.
-func ConfigCmd() *cobra.Command {
+func ConfigCmd(defaultCLIHome string) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "config <key> [value]",
 		Short: "Create or query a Gaia CLI configuration file",
@@ -40,7 +38,7 @@ func ConfigCmd() *cobra.Command {
 		Args:  cobra.RangeArgs(0, 2),
 	}
 
-	cmd.Flags().String(cli.HomeFlag, app.DefaultCLIHome,
+	cmd.Flags().String(cli.HomeFlag, defaultCLIHome,
 		"set client's home directory for configuration")
 	cmd.Flags().Bool(flagGet, false,
 		"print configuration value or its default if unset")
diff --git a/cmd/gaia/cmd/gaiacli/main.go b/cmd/gaia/cmd/gaiacli/main.go
index f390324aa3..3042c35d60 100644
--- a/cmd/gaia/cmd/gaiacli/main.go
+++ b/cmd/gaia/cmd/gaiacli/main.go
@@ -84,7 +84,7 @@ func main() {
 	// Construct Root Command
 	rootCmd.AddCommand(
 		rpc.StatusCommand(),
-		client.ConfigCmd(),
+		client.ConfigCmd(app.DefaultCLIHome),
 		queryCmd(cdc, mc),
 		txCmd(cdc, mc),
 		client.LineBreak,