diff --git a/cw_monero/lib/monero_wallet_service.dart b/cw_monero/lib/monero_wallet_service.dart
index 8e9eb6eac..077ab4e54 100644
--- a/cw_monero/lib/monero_wallet_service.dart
+++ b/cw_monero/lib/monero_wallet_service.dart
@@ -273,6 +273,9 @@ class MoneroWalletService extends WalletService<
         date: DateTime.fromMillisecondsSinceEpoch(polyseed.birthday * 1000));
     final spendKey = keyToHexString(polyseed.generateKey(coin, 32));
 
+    walletInfo.isRecovery = true;
+    walletInfo.restoreHeight = height;
+
     await monero_wallet_manager.restoreFromSpendKey(
         path: path,
         password: password,
diff --git a/cw_nano/lib/nano_wallet.dart b/cw_nano/lib/nano_wallet.dart
index 795634849..b0d98efec 100644
--- a/cw_nano/lib/nano_wallet.dart
+++ b/cw_nano/lib/nano_wallet.dart
@@ -186,9 +186,9 @@ abstract class NanoWalletBase
 
       final block = await _client.constructSendBlock(
         amountRaw: amt.toString(),
-        destinationAddress: credentials.outputs.first.isParsedAddress
-            ? credentials.outputs.first.extractedAddress!
-            : credentials.outputs.first.address,
+        destinationAddress: txOut.isParsedAddress
+            ? txOut.extractedAddress!
+            : txOut.address,
         privateKey: _privateKey!,
         balanceAfterTx: runningBalance,
         previousHash: previousHash,
diff --git a/lib/view_model/dashboard/nft_view_model.dart b/lib/view_model/dashboard/nft_view_model.dart
index ec5919b7d..c5acf5523 100644
--- a/lib/view_model/dashboard/nft_view_model.dart
+++ b/lib/view_model/dashboard/nft_view_model.dart
@@ -4,6 +4,7 @@ import 'dart:developer';
 
 import 'package:cake_wallet/core/wallet_connect/wc_bottom_sheet_service.dart';
 import 'package:cake_wallet/src/screens/wallet_connect/widgets/message_display_widget.dart';
+import 'package:cw_core/wallet_type.dart';
 import 'package:http/http.dart' as http;
 import 'package:mobx/mobx.dart';
 import 'package:cake_wallet/.secrets.g.dart' as secrets;
@@ -38,6 +39,8 @@ abstract class NFTViewModelBase with Store {
 
   @action
   Future<void> getNFTAssetByWallet() async {
+    if (appStore.wallet!.type != WalletType.ethereum) return;
+
     final walletAddress = appStore.wallet!.walletInfo.address;
     log('Fetching wallet NFTs for $walletAddress');