diff --git a/presenter/presenter.go b/presenter/presenter.go
index f3e3381..c7f8075 100644
--- a/presenter/presenter.go
+++ b/presenter/presenter.go
@@ -122,11 +122,12 @@ func (p *Presenter) getBridgeSideInfo(ctx context.Context, bridgeID string, cfg
 func (p *Presenter) getBlockTimeOrDefault(ctx context.Context, chainID string, blockNumber uint) (time.Time, error) {
 	bt, err := p.repo.BlockTimestamps.GetByBlockNumber(ctx, chainID, blockNumber)
 	if err != nil && !errors.Is(err, db.ErrNotFound) {
+		if errors.Is(err, db.ErrNotFound) {
+			return time.Time{}, nil
+		}
 		return time.Time{}, fmt.Errorf("failed to get block timestamp: %w", err)
-	} else if err == nil {
-		return bt.Timestamp, nil
 	}
-	return time.Time{}, nil
+	return bt.Timestamp, nil
 }
 
 func (p *Presenter) GetBridgeConfig(w http.ResponseWriter, r *http.Request) {
diff --git a/repository/postgres/bridge_validators.go b/repository/postgres/bridge_validators.go
index 4ddbd97..d4ce43c 100644
--- a/repository/postgres/bridge_validators.go
+++ b/repository/postgres/bridge_validators.go
@@ -77,10 +77,7 @@ func (r *bridgeValidatorsRepo) FindActiveValidators(ctx context.Context, bridgeI
 	vals := make([]*entity.BridgeValidator, 0, 10)
 	err = r.db.SelectContext(ctx, &vals, q, args...)
 	if err != nil {
-		if errors.Is(err, sql.ErrNoRows) {
-			return nil, nil
-		}
-		return nil, fmt.Errorf("can't get bridge validator: %w", err)
+		return nil, fmt.Errorf("can't get bridge validators: %w", err)
 	}
 	return vals, nil
 }