diff --git a/mempool/v0/clist_mempool.go b/mempool/v0/clist_mempool.go
index 605b553f4..47b7a85ed 100644
--- a/mempool/v0/clist_mempool.go
+++ b/mempool/v0/clist_mempool.go
@@ -259,10 +259,6 @@ func (mem *CListMempool) CheckTx(
 
 	mem.addNewTransaction(tx, txInfo.SenderID, txInfo.SenderP2PID, cb, resp)
 
-	if cb != nil {
-		cb(resp)
-	}
-
 	return nil
 }
 
diff --git a/rpc/client/helpers.go b/rpc/client/helpers.go
index 8014d875a..4f9e83e69 100644
--- a/rpc/client/helpers.go
+++ b/rpc/client/helpers.go
@@ -69,7 +69,7 @@ func WaitForOneEvent(c EventsClient, evtTyp string, timeout time.Duration) (type
 	}
 	// make sure to unregister after the test is over
 	defer func() {
-		if deferErr := c.UnsubscribeAll(ctx, subscriber); deferErr != nil {
+		if deferErr := c.UnsubscribeAll(context.Background(), subscriber); deferErr != nil {
 			panic(deferErr)
 		}
 	}()
diff --git a/state/execution.go b/state/execution.go
index 2b56a79d5..165869d82 100644
--- a/state/execution.go
+++ b/state/execution.go
@@ -521,6 +521,14 @@ func fireEvents(
 		logger.Error("failed publishing new block header", "err", err)
 	}
 
+	if err := eventBus.PublishEventNewBlockEvents(types.EventDataNewBlockEvents{
+		Height: block.Height,
+		Events: abciResponse.Events,
+		NumTxs: int64(len(block.Txs)),
+	}); err != nil {
+		logger.Error("failed publishing new block events", "err", err)
+	}
+
 	if len(block.Evidence.Evidence) != 0 {
 		for _, ev := range block.Evidence.Evidence {
 			if err := eventBus.PublishEventNewEvidence(types.EventDataNewEvidence{
diff --git a/types/event_bus.go b/types/event_bus.go
index cbc6c18f4..239df1919 100644
--- a/types/event_bus.go
+++ b/types/event_bus.go
@@ -256,6 +256,10 @@ func (NopEventBus) PublishEventNewBlockHeader(data EventDataNewBlockHeader) erro
 	return nil
 }
 
+func (NopEventBus) PublishEventNewBlockEvents(data EventDataNewBlockEvents) error {
+	return nil
+}
+
 func (NopEventBus) PublishEventNewEvidence(evidence EventDataNewEvidence) error {
 	return nil
 }
diff --git a/types/events.go b/types/events.go
index 857beee6a..960465cc2 100644
--- a/types/events.go
+++ b/types/events.go
@@ -177,6 +177,7 @@ func QueryForEvent(eventType string) tmpubsub.Query {
 type BlockEventPublisher interface {
 	PublishEventNewBlock(block EventDataNewBlock) error
 	PublishEventNewBlockHeader(header EventDataNewBlockHeader) error
+	PublishEventNewBlockEvents(header EventDataNewBlockEvents) error
 	PublishEventNewEvidence(evidence EventDataNewEvidence) error
 	PublishEventTx(EventDataTx) error
 	PublishEventValidatorSetUpdates(EventDataValidatorSetUpdates) error