diff --git a/blockchain/reactor_test.go b/blockchain/reactor_test.go
index f58b8394..2edff18b 100644
--- a/blockchain/reactor_test.go
+++ b/blockchain/reactor_test.go
@@ -32,7 +32,7 @@ func newBlockchainReactor(logger log.Logger, maxBlockHeight int64) *BlockchainRe
 	// Make the blockchainReactor itself
 	fastSync := true
 	blockExec := sm.NewBlockExecutor(dbm.NewMemDB(), log.TestingLogger(),
-		nil, nil, types.MockMempool{}, types.MockEvidencePool{})
+		types.NopEventBus{}, nil, types.MockMempool{}, types.MockEvidencePool{})
 
 	bcReactor := NewBlockchainReactor(state.Copy(), blockExec, blockStore, fastSync)
 	bcReactor.SetLogger(logger.With("module", "blockchain"))
diff --git a/consensus/common_test.go b/consensus/common_test.go
index ba3564aa..1516365e 100644
--- a/consensus/common_test.go
+++ b/consensus/common_test.go
@@ -266,7 +266,7 @@ func newConsensusStateWithConfigAndBlockStore(thisConfig *cfg.Config, state sm.S
 	// Make ConsensusReactor
 	stateDB := dbm.NewMemDB() // XXX !!
 	blockExec := sm.NewBlockExecutor(stateDB, log.TestingLogger(),
-		nil, proxyAppConnCon, mempool, evpool)
+		types.NopEventBus{}, proxyAppConnCon, mempool, evpool)
 	cs := NewConsensusState(thisConfig.Consensus, state, blockExec, blockStore, mempool, evpool)
 	cs.SetLogger(log.TestingLogger())
 	cs.SetPrivValidator(pv)
diff --git a/consensus/replay_file.go b/consensus/replay_file.go
index d832abad..4e490ccb 100644
--- a/consensus/replay_file.go
+++ b/consensus/replay_file.go
@@ -306,7 +306,7 @@ func newConsensusStateForReplay(config cfg.BaseConfig, csConfig *cfg.ConsensusCo
 
 	mempool, evpool := types.MockMempool{}, types.MockEvidencePool{}
 	blockExec := sm.NewBlockExecutor(stateDB, log.TestingLogger(),
-		nil, proxyApp.Consensus(),
+		types.NopEventBus{}, proxyApp.Consensus(),
 		mempool, evpool)
 
 	consensusState := NewConsensusState(csConfig, state.Copy(), blockExec,
diff --git a/consensus/wal_generator.go b/consensus/wal_generator.go
index fe9066b3..c4171b12 100644
--- a/consensus/wal_generator.go
+++ b/consensus/wal_generator.go
@@ -67,7 +67,7 @@ func WALWithNBlocks(numBlocks int) (data []byte, err error) {
 	defer eventBus.Stop()
 	mempool := types.MockMempool{}
 	evpool := types.MockEvidencePool{}
-	blockExec := sm.NewBlockExecutor(stateDB, log.TestingLogger(), nil, proxyApp.Consensus(), mempool, evpool)
+	blockExec := sm.NewBlockExecutor(stateDB, log.TestingLogger(), types.NopEventBus{}, proxyApp.Consensus(), mempool, evpool)
 	consensusState := NewConsensusState(config.Consensus, state.Copy(), blockExec, blockStore, mempool, evpool)
 	consensusState.SetLogger(logger)
 	consensusState.SetEventBus(eventBus)
diff --git a/node/node.go b/node/node.go
index 15e4f043..603fafec 100644
--- a/node/node.go
+++ b/node/node.go
@@ -219,7 +219,7 @@ func NewNode(config *cfg.Config,
 	blockExecLogger := logger.With("module", "state")
 	// make block executor for consensus and blockchain reactors to execute blocks
 	blockExec := sm.NewBlockExecutor(stateDB, blockExecLogger,
-		nil, proxyApp.Consensus(),
+		types.NopEventBus{}, proxyApp.Consensus(),
 		mempool, evidencePool)
 
 	// Make BlockchainReactor