diff --git a/src/modules/pair/services/pair.compute.service.ts b/src/modules/pair/services/pair.compute.service.ts
index 52ef42438..56f11b3fb 100644
--- a/src/modules/pair/services/pair.compute.service.ts
+++ b/src/modules/pair/services/pair.compute.service.ts
@@ -531,7 +531,9 @@ export class PairComputeService implements IPairComputeService {
             ),
         );
 
-        return actualFees24hBig.times(365).div(lockedValueUSD).toFixed();
+        const feesAPR = actualFees24hBig.times(365).div(lockedValueUSD);
+
+        return !feesAPR.isNaN() ? feesAPR.toFixed() : '0';
     }
 
     @ErrorLoggerAsync({
diff --git a/src/modules/staking/services/staking.transactions.service.ts b/src/modules/staking/services/staking.transactions.service.ts
index f01dcdc83..96982c9b4 100644
--- a/src/modules/staking/services/staking.transactions.service.ts
+++ b/src/modules/staking/services/staking.transactions.service.ts
@@ -9,7 +9,7 @@ import {
 } from '@multiversx/sdk-core';
 import { Injectable } from '@nestjs/common';
 import { BigNumber } from 'bignumber.js';
-import { mxConfig, gasConfig } from 'src/config';
+import { mxConfig, gasConfig, constantsConfig } from 'src/config';
 import { InputTokenModel } from 'src/models/inputToken.model';
 import { TransactionModel } from 'src/models/transaction.model';
 import { MXProxyService } from 'src/services/multiversx-communication/mx.proxy.service';
@@ -226,7 +226,11 @@ export class StakingTransactionService {
 
         const promises: Promise<TransactionModel>[] = [];
         userNfts.forEach((nft) => {
-            if (nft.nonce < migrationNonce) {
+            if (
+                nft.nonce < migrationNonce &&
+                nft.attributes.length >
+                    constantsConfig.STAKING_UNBOND_ATTRIBUTES_LEN
+            ) {
                 promises.push(
                     this.claimRewards(userAddress, stakingAddress, {
                         tokenID: nft.collection,