diff --git a/app/app.go b/app/app.go
index 6211246e3..778af5b6e 100644
--- a/app/app.go
+++ b/app/app.go
@@ -290,15 +290,18 @@ func NewWasmApp(
 	interfaceRegistry := encodingConfig.InterfaceRegistry
 
 	bApp := baseapp.NewBaseApp(appName, logger, db, encodingConfig.TxConfig.TxDecoder(), baseAppOptions...)
-	bApp.SetCommitMultiStoreTracer(traceStore)
-	bApp.SetVersion(version.Version)
-	bApp.SetInterfaceRegistry(interfaceRegistry)
 
 	//TODO: find a cleaner way to access store history
-	//This is used for yield calculation
+	//Maybe this could cause a problem regarding interBlockCache (see baseapp constructor)
+	//This is used for yield calculation, set the multistore before setting the multistore tracer
 	cms := store.NewCommitMultiStore(db)
 	bApp.SetCMS(cms)
 
+	bApp.SetCommitMultiStoreTracer(traceStore)
+	bApp.SetVersion(version.Version)
+	bApp.SetInterfaceRegistry(interfaceRegistry)
+
+
 	keys := sdk.NewKVStoreKeys(
 		authtypes.StoreKey, banktypes.StoreKey, stakingtypes.StoreKey,
 		minttypes.StoreKey, distrtypes.StoreKey, slashingtypes.StoreKey,