diff --git a/baseapp/baseapp.go b/baseapp/baseapp.go
index a89620485087..0c10a274e0b0 100644
--- a/baseapp/baseapp.go
+++ b/baseapp/baseapp.go
@@ -707,9 +707,14 @@ func (app *BaseApp) cacheTxContext(ctx sdk.Context, txBytes []byte) (sdk.Context
 func (app *BaseApp) preBlock(req *abci.RequestFinalizeBlock) ([]abci.Event, error) {
 	var events []abci.Event
 	if app.preBlocker != nil {
+<<<<<<< HEAD
 		ctx := app.finalizeBlockState.Context()
 		rsp, err := app.preBlocker(ctx, req)
 		if err != nil {
+=======
+		ctx := app.finalizeBlockState.Context().WithEventManager(sdk.NewEventManager())
+		if err := app.preBlocker(ctx, req); err != nil {
+>>>>>>> 58bbcd9d7 (fix(baseapp): preblock events are not emmitted correctly (#21444))
 			return nil, err
 		}
 		// rsp.ConsensusParamsChanged is true from preBlocker means ConsensusParams in store get changed
diff --git a/types/module/module.go b/types/module/module.go
index 432d51b5fde9..f1285adeb6dd 100644
--- a/types/module/module.go
+++ b/types/module/module.go
@@ -750,9 +750,13 @@ func (m Manager) RunMigrations(ctx context.Context, cfg Configurator, fromVM Ver
 // PreBlock performs begin block functionality for upgrade module.
 // It takes the current context as a parameter and returns a boolean value
 // indicating whether the migration was successfully executed or not.
+<<<<<<< HEAD
 func (m *Manager) PreBlock(ctx sdk.Context) (*sdk.ResponsePreBlock, error) {
 	ctx = ctx.WithEventManager(sdk.NewEventManager())
 	paramsChanged := false
+=======
+func (m *Manager) PreBlock(ctx sdk.Context) error {
+>>>>>>> 58bbcd9d7 (fix(baseapp): preblock events are not emmitted correctly (#21444))
 	for _, moduleName := range m.OrderPreBlockers {
 		if module, ok := m.Modules[moduleName].(appmodule.HasPreBlocker); ok {
 			rsp, err := module.PreBlock(ctx)