diff --git a/api/gateway/tron/internal/service/gateway/driver/evm/evm.go b/api/gateway/tron/internal/service/gateway/driver/evm/evm.go
index 2cbde5a9..7e6d360e 100644
--- a/api/gateway/tron/internal/service/gateway/driver/evm/evm.go
+++ b/api/gateway/tron/internal/service/gateway/driver/evm/evm.go
@@ -155,7 +155,11 @@ func Balance(ctx context.Context, deps driver.Deps, network shared.Network, wall
 		return nil, merrors.Internal("network rpc url is not configured")
 	}
 
-	contract := strings.TrimSpace(wallet.ContractAddress)
+	contract, err := tronBase58ToHex(strings.TrimSpace(wallet.ContractAddress))
+	if err != nil {
+		logger.Warn("Failed to convert contract address", zap.String("contract_address", wallet.ContractAddress))
+		return nil, err
+	}
 	if contract == "" {
 		logger.Debug("Native balance requested", logFields...)
 		return NativeBalance(ctx, deps, network, wallet, normalizedAddress)
diff --git a/api/payments/orchestrator/storage/mongo/store/payments.go b/api/payments/orchestrator/storage/mongo/store/payments.go
index 705ee661..c5190d4f 100644
--- a/api/payments/orchestrator/storage/mongo/store/payments.go
+++ b/api/payments/orchestrator/storage/mongo/store/payments.go
@@ -200,12 +200,11 @@ func (p *Payments) List(ctx context.Context, filter *model.PaymentFilter) (*mode
 			query = query.And(endpointFilter)
 		}
 	}
-	if ref := strings.TrimSpace(filter.OrganizationRef); ref != "" {
-		orgRef, err := bson.ObjectIDFromHex(ref)
-		if err != nil {
-			p.logger.Warn("Failed to decode organization reference", zap.Error(err), zap.String("provided_org_ref", ref))
-			return nil, err
-		}
+	if orgRef, err := bson.ObjectIDFromHex(strings.TrimSpace(filter.OrganizationRef)); err != nil {
+		p.logger.Warn("Failed to decode organization reference", zap.Error(err),
+			zap.String("provided_org_ref", filter.OrganizationRef))
+		return nil, err
+	} else {
 		query.And(repository.OrgFilter(orgRef))
 	}
 
@@ -231,7 +230,7 @@ func (p *Payments) List(ctx context.Context, filter *model.PaymentFilter) (*mode
 	decoder := func(cur *mongo.Cursor) error {
 		item := &model.Payment{}
 		if err := cur.Decode(item); err != nil {
-			p.logger.Warn("Failed to decode item", zap.Error(err), zap.Any("item", cur.Current))
+			p.logger.Warn("Failed to decode item", zap.Error(err))
 			return err
 		}
 		payments = append(payments, item)