diff --git a/server/config/config.go b/server/config/config.go
index 0923b6fd9aec..f191e5e7f96f 100644
--- a/server/config/config.go
+++ b/server/config/config.go
@@ -304,17 +304,18 @@ func (c *Config) GetMinGasPrices() sdk.DecCoins {
 func DefaultConfig() *Config {
 	return &Config{
 		BaseConfig: BaseConfig{
-			MinGasPrices:        defaultMinGasPrices,
-			InterBlockCache:     true,
-			Pruning:             pruningtypes.PruningOptionDefault,
-			PruningKeepRecent:   "0",
-			PruningInterval:     "0",
-			MinRetainBlocks:     0,
-			IndexEvents:         make([]string, 0),
-			IAVLCacheSize:       781250,
-			IAVLDisableFastNode: false,
-			IAVLLazyLoading:     false,
-			AppDBBackend:        "",
+			MinGasPrices:                defaultMinGasPrices,
+			InterBlockCache:             true,
+			Pruning:                     pruningtypes.PruningOptionDefault,
+			PruningKeepRecent:           "0",
+			PruningInterval:             "0",
+			MinRetainBlocks:             0,
+			IndexEvents:                 make([]string, 0),
+			IAVLCacheSize:               781250,
+			IAVLDisableFastNode:         false,
+			IAVLFastNodeModuleWhitelist: []string{"lockup"},
+			IAVLLazyLoading:             false,
+			AppDBBackend:                "",
 		},
 		Telemetry: telemetry.Config{
 			Enabled:      false,
diff --git a/server/start.go b/server/start.go
index cc8ce2a09055..c50fa8ca90d7 100644
--- a/server/start.go
+++ b/server/start.go
@@ -939,6 +939,7 @@ func addStartNodeFlags(cmd *cobra.Command, defaultNodeHome string) {
 	cmd.Flags().Uint32(FlagStateSyncSnapshotKeepRecent, 2, "State sync snapshot to keep")
 
 	cmd.Flags().Bool(FlagDisableIAVLFastNode, false, "Disable fast node for IAVL tree")
+	cmd.Flags().StringArray(FlagIAVLFastNodeModuleWhitelist, []string{"lockup"}, "Comma separated list of modules to enable fast node for")
 
 	cmd.Flags().Int(FlagMempoolMaxTxs, mempool.DefaultMaxTx, "Sets MaxTx value for the app-side mempool")