diff --git a/lib/di.dart b/lib/di.dart
index f1c6f562f..763a82834 100644
--- a/lib/di.dart
+++ b/lib/di.dart
@@ -639,7 +639,8 @@ Future setup(
 
   getIt.registerFactory(() => YatService());
 
-  getIt.registerFactory(() => AddressResolver(yatService: getIt.get<YatService>()));
+  getIt.registerFactory(() => AddressResolver(yatService: getIt.get<YatService>(),
+    walletType: getIt.get<AppStore>().wallet.type));
 
   getIt.registerFactoryParam<FullscreenQRPage, String, bool>(
           (String qrData, bool isLight) => FullscreenQRPage(qrData: qrData, isLight: isLight,));
diff --git a/lib/entities/parse_address_from_domain.dart b/lib/entities/parse_address_from_domain.dart
index b074eb7f7..4778be0cd 100644
--- a/lib/entities/parse_address_from_domain.dart
+++ b/lib/entities/parse_address_from_domain.dart
@@ -3,14 +3,16 @@ import 'package:cake_wallet/entities/openalias_record.dart';
 import 'package:cake_wallet/entities/parsed_address.dart';
 import 'package:cake_wallet/entities/unstoppable_domain_address.dart';
 import 'package:cake_wallet/entities/emoji_string_extension.dart';
+import 'package:cw_core/wallet_type.dart';
 import 'package:flutter/foundation.dart';
 import 'package:cake_wallet/entities/fio_address_provider.dart';
 
 class AddressResolver {
   
-  AddressResolver({@required this.yatService});
+  AddressResolver({@required this.yatService, this.walletType});
   
   final YatService yatService;
+  final WalletType walletType;
   
   static const unstoppableDomains = [
   'crypto',
@@ -36,8 +38,10 @@ class AddressResolver {
 
       }
       if (text.hasOnlyEmojis) {
-        final addresses = await yatService.fetchYatAddress(text, ticker);
-        return ParsedAddress.fetchEmojiAddress(addresses: addresses, name: text);
+        if (walletType != WalletType.haven) {
+          final addresses = await yatService.fetchYatAddress(text, ticker);
+          return ParsedAddress.fetchEmojiAddress(addresses: addresses, name: text);
+        }
       }
       final formattedName = OpenaliasRecord.formatDomainName(text);
       final domainParts = formattedName.split('.');