diff --git a/lib/pages/exchange_view/exchange_coin_selection/exchange_currency_selection_view.dart b/lib/pages/exchange_view/exchange_coin_selection/exchange_currency_selection_view.dart
index c6ba3de2d..1c36e139f 100644
--- a/lib/pages/exchange_view/exchange_coin_selection/exchange_currency_selection_view.dart
+++ b/lib/pages/exchange_view/exchange_coin_selection/exchange_currency_selection_view.dart
@@ -26,14 +26,12 @@ import 'package:stackwallet/widgets/textfield_icon_button.dart';
 class ExchangeCurrencySelectionView extends StatefulWidget {
   const ExchangeCurrencySelectionView({
     Key? key,
-    required this.exchangeName,
     required this.willChange,
     required this.paired,
     required this.isFixedRate,
     required this.willChangeIsSend,
   }) : super(key: key);
 
-  final String exchangeName;
   final Currency? willChange;
   final Currency? paired;
   final bool isFixedRate;
@@ -109,7 +107,6 @@ class _ExchangeCurrencySelectionViewState
   Future<Currency?> _getCurrency(String ticker) {
     return ExchangeDataLoadingService.instance.isar.currencies
         .where()
-        .exchangeNameEqualTo(widget.exchangeName)
         .filter()
         .tickerEqualTo(ticker, caseSensitive: false)
         .group((q) => widget.isFixedRate
@@ -127,7 +124,6 @@ class _ExchangeCurrencySelectionViewState
   Future<List<Pair>> _loadAvailablePairs() {
     final query = ExchangeDataLoadingService.instance.isar.pairs
         .where()
-        .exchangeNameEqualTo(widget.exchangeName)
         .filter()
         .group((q) => widget.isFixedRate
             ? q
@@ -153,7 +149,6 @@ class _ExchangeCurrencySelectionViewState
   Future<List<Currency>> _getCurrencies() async {
     return ExchangeDataLoadingService.instance.isar.currencies
         .where()
-        .exchangeNameEqualTo(widget.exchangeName)
         .filter()
         .group((q) => widget.isFixedRate
             ? q
@@ -166,6 +161,7 @@ class _ExchangeCurrencySelectionViewState
                 .rateTypeEqualTo(SupportedRateType.estimated))
         .sortByIsStackCoin()
         .thenByName()
+        .distinctByTicker(caseSensitive: false)
         .findAll();
   }
 
diff --git a/lib/pages/exchange_view/exchange_form.dart b/lib/pages/exchange_view/exchange_form.dart
index f076d5e6a..701ecbf22 100644
--- a/lib/pages/exchange_view/exchange_form.dart
+++ b/lib/pages/exchange_view/exchange_form.dart
@@ -241,10 +241,6 @@ class _ExchangeFormState extends ConsumerState<ExchangeForm> {
                                     .extension<StackColors>()!
                                     .background,
                                 child: ExchangeCurrencySelectionView(
-                                  exchangeName: ref
-                                      .read(currentExchangeNameStateProvider
-                                          .state)
-                                      .state,
                                   willChange: willChange,
                                   paired: paired,
                                   isFixedRate: isFixedRate,
@@ -263,8 +259,6 @@ class _ExchangeFormState extends ConsumerState<ExchangeForm> {
         : await Navigator.of(context).push(
             MaterialPageRoute<dynamic>(
               builder: (_) => ExchangeCurrencySelectionView(
-                exchangeName:
-                    ref.read(currentExchangeNameStateProvider.state).state,
                 willChange: willChange,
                 paired: paired,
                 isFixedRate: isFixedRate,