diff --git a/runtime/module.go b/runtime/module.go
index 1cd814f15844..dbfe511b92c4 100644
--- a/runtime/module.go
+++ b/runtime/module.go
@@ -67,14 +67,13 @@ func init() {
 			ProvideTransientStoreKey,
 			ProvideMemoryStoreKey,
 			ProvideGenesisTxHandler,
-			ProvideKVStoreService,
+			ProvideEnvironment,
 			ProvideMemoryStoreService,
 			ProvideTransientStoreService,
 			ProvideEventService,
 			ProvideBasicManager,
 			ProvideAppVersionModifier,
 			ProvideAddressCodec,
-			ProvideEnvironment,
 		),
 		appconfig.Invoke(SetupAppBuilder),
 	)
@@ -225,9 +224,10 @@ func ProvideGenesisTxHandler(appBuilder *AppBuilder) genesis.TxHandler {
 	return appBuilder.app
 }
 
-func ProvideKVStoreService(config *runtimev1alpha1.Module, key depinject.ModuleKey, app *AppBuilder) store.KVStoreService {
+func ProvideEnvironment(config *runtimev1alpha1.Module, key depinject.ModuleKey, app *AppBuilder) (store.KVStoreService, appmodule.Environment) {
 	storeKey := ProvideKVStoreKey(config, key, app)
-	return kvStoreService{key: storeKey}
+	kvService := kvStoreService{key: storeKey}
+	return kvService, NewEnvironment(kvService)
 }
 
 func ProvideMemoryStoreService(key depinject.ModuleKey, app *AppBuilder) store.MemoryStoreService {
@@ -252,10 +252,6 @@ func ProvideAppVersionModifier(app *AppBuilder) baseapp.AppVersionModifier {
 	return app.app
 }
 
-func ProvideEnvironment(kvService store.KVStoreService) appmodule.Environment {
-	return NewEnvironment(kvService)
-}
-
 type (
 	// ValidatorAddressCodec is an alias for address.Codec for validator addresses.
 	ValidatorAddressCodec address.Codec