diff --git a/app/app.go b/app/app.go
index 95270325..ffeb1b29 100644
--- a/app/app.go
+++ b/app/app.go
@@ -214,6 +214,7 @@ func NewTerraApp(
 		cdc,
 		appOpts,
 		app.GetWasmOpts(appOpts),
+		homePath,
 	)
 	app.keys = app.Keepers.GetKVStoreKey()
 	app.tkeys = app.Keepers.GetTransientStoreKey()
diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go
index e5dd70b2..4cd0e67f 100644
--- a/app/keepers/keepers.go
+++ b/app/keepers/keepers.go
@@ -13,7 +13,6 @@ import (
 	"github.com/spf13/cast"
 
 	"github.com/cosmos/cosmos-sdk/baseapp"
-	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/server"
 	servertypes "github.com/cosmos/cosmos-sdk/server/types"
@@ -189,6 +188,7 @@ func NewTerraAppKeepers(
 	cdc *codec.LegacyAmino,
 	appOpts servertypes.AppOptions,
 	wasmOpts []wasmkeeper.Option,
+	homePath string,
 ) (keepers TerraAppKeepers) {
 	// Set keys KVStoreKey, TransientStoreKey, MemoryStoreKey
 	keepers.GenerateKeys()
@@ -220,8 +220,8 @@ func NewTerraAppKeepers(
 	keepers.ScopedTransferKeeper = keepers.CapabilityKeeper.ScopeToModule(ibctransfertypes.ModuleName)
 	keepers.ScopedICAControllerKeeper = keepers.CapabilityKeeper.ScopeToModule(icacontrollertypes.SubModuleName)
 	keepers.ScopedICAHostKeeper = keepers.CapabilityKeeper.ScopeToModule(icahosttypes.SubModuleName)
-	keepers.scopedWasmKeeper = keepers.CapabilityKeeper.ScopeToModule(icqtypes.ModuleName)
-	keepers.ScopedICQKeeper = keepers.CapabilityKeeper.ScopeToModule(wasmtypes.ModuleName)
+	keepers.scopedWasmKeeper = keepers.CapabilityKeeper.ScopeToModule(wasmtypes.ModuleName)
+	keepers.ScopedICQKeeper = keepers.CapabilityKeeper.ScopeToModule(icqtypes.ModuleName)
 
 	keepers.AccountKeeper = authkeeper.NewAccountKeeper(
 		appCodec,
@@ -284,7 +284,6 @@ func NewTerraAppKeepers(
 	for _, h := range cast.ToIntSlice(appOpts.Get(server.FlagUnsafeSkipUpgrades)) {
 		skipUpgradeHeights[int64(h)] = true
 	}
-	homePath := cast.ToString(appOpts.Get(flags.FlagHome))
 	keepers.UpgradeKeeper = upgradekeeper.NewKeeper(
 		skipUpgradeHeights,
 		keys[upgradetypes.StoreKey],