diff --git a/tests/integration/evidence/keeper/infraction_test.go b/tests/integration/evidence/keeper/infraction_test.go
index 9a768c60c6..5709f24ac0 100644
--- a/tests/integration/evidence/keeper/infraction_test.go
+++ b/tests/integration/evidence/keeper/infraction_test.go
@@ -231,7 +231,8 @@ func TestHandleDoubleSign(t *testing.T) {
 	tstaking.Undelegate(sdk.AccAddress(operatorAddr), operatorAddr, totalBond, true)
 
 	// query evidence from store
-	evidences := f.evidenceKeeper.GetAllEvidence(ctx)
+	evidences, err := f.evidenceKeeper.GetAllEvidence(ctx)
+	assert.NilError(t, err)
 	assert.Assert(t, len(evidences) == 1)
 }
 
diff --git a/x/evidence/genesis.go b/x/evidence/genesis.go
index 30455d09cf..666f1806f4 100644
--- a/x/evidence/genesis.go
+++ b/x/evidence/genesis.go
@@ -34,7 +34,10 @@ func InitGenesis(ctx sdk.Context, k keeper.Keeper, gs *types.GenesisState) {
 
 // ExportGenesis returns the evidence module's exported genesis.
 func ExportGenesis(ctx sdk.Context, k keeper.Keeper) *types.GenesisState {
-	e := k.GetAllEvidence(ctx)
+	e, err := k.GetAllEvidence(ctx)
+	if err != nil {
+		panic(err)
+	}
 	evidence := make([]*codectypes.Any, len(e))
 	for i, evi := range e {
 		msg, ok := evi.(proto.Message)
diff --git a/x/evidence/genesis_test.go b/x/evidence/genesis_test.go
index 2a5e8384cd..489c213d4f 100644
--- a/x/evidence/genesis_test.go
+++ b/x/evidence/genesis_test.go
@@ -93,7 +93,9 @@ func (suite *GenesisTestSuite) TestInitGenesis() {
 			},
 			false,
 			func() {
-				suite.Empty(suite.keeper.GetAllEvidence(suite.ctx))
+				ev, err := suite.keeper.GetAllEvidence(suite.ctx)
+				suite.Empty(ev)
+				suite.NoError(err)
 			},
 		},
 	}
diff --git a/x/evidence/keeper/keeper.go b/x/evidence/keeper/keeper.go
index 107fa4e7cd..ba3a170ea5 100644
--- a/x/evidence/keeper/keeper.go
+++ b/x/evidence/keeper/keeper.go
@@ -165,13 +165,13 @@ func (k Keeper) IterateEvidence(ctx context.Context, cb func(exported.Evidence)
 }
 
 // GetAllEvidence returns all stored Evidence objects.
-func (k Keeper) GetAllEvidence(ctx context.Context) (evidence []exported.Evidence) {
-	k.IterateEvidence(ctx, func(e exported.Evidence) error {
+func (k Keeper) GetAllEvidence(ctx context.Context) (evidence []exported.Evidence, err error) {
+	err = k.IterateEvidence(ctx, func(e exported.Evidence) error {
 		evidence = append(evidence, e)
 		return nil
 	})
 
-	return evidence
+	return evidence, err
 }
 
 // MustUnmarshalEvidence attempts to decode and return an Evidence object from
diff --git a/x/evidence/keeper/keeper_test.go b/x/evidence/keeper/keeper_test.go
index a3e6abbb92..6714c2aedc 100644
--- a/x/evidence/keeper/keeper_test.go
+++ b/x/evidence/keeper/keeper_test.go
@@ -214,8 +214,9 @@ func (suite *KeeperTestSuite) TestIterateEvidence() {
 	numEvidence := 100
 	suite.populateEvidence(ctx, numEvidence)
 
-	evidence := suite.evidenceKeeper.GetAllEvidence(ctx)
+	evidence, err := suite.evidenceKeeper.GetAllEvidence(ctx)
 	suite.Len(evidence, numEvidence)
+	suite.NoError(err)
 }
 
 func (suite *KeeperTestSuite) TestGetEvidenceHandler() {