diff --git a/CHANGELOG.md b/CHANGELOG.md
index fdc9223055..0ba8fb7006 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -67,6 +67,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 * (x/authz) [#24638](https://github.com/cosmos/cosmos-sdk/pull/24638) Fixed a minor bug where the grant key was cast as a string and dumped directly into the error message leading to an error string possibly containing invalid UTF-8.
 * (client, client/rpc, x/auth/tx) [#24551](https://github.com/cosmos/cosmos-sdk/pull/24551) Handle cancellation properly when supplying context to client methods.
 * (x/epochs) [#24770](https://github.com/cosmos/cosmos-sdk/pull/24770) Fix register of epoch hooks in `InvokeSetHooks`.
+* (x/epochs) [#25087](https://github.com/cosmos/cosmos-sdk/pull/25087) Remove redundant error check in BeginBlocker.
 * [GHSA-p22h-3m2v-cmgh](https://github.com/cosmos/cosmos-sdk/security/advisories/GHSA-p22h-3m2v-cmgh) Fix x/distribution can halt when historical rewards overflow.
 
 ### Deprecated
diff --git a/x/epochs/keeper/abci.go b/x/epochs/keeper/abci.go
index 3e266a2608..03d2bea66b 100644
--- a/x/epochs/keeper/abci.go
+++ b/x/epochs/keeper/abci.go
@@ -47,9 +47,6 @@ func (k *Keeper) BeginBlocker(ctx sdk.Context) error {
 				if err != nil {
 					return false, err
 				}
-				if err != nil {
-					return false, nil
-				}
 
 				cacheCtx, writeFn := ctx.CacheContext()
 				if err := k.AfterEpochEnd(cacheCtx, epochInfo.Identifier, epochInfo.CurrentEpoch); err != nil {