diff --git a/lib/pages/home_view/home_view.dart b/lib/pages/home_view/home_view.dart
index b4c643b65..33744570b 100644
--- a/lib/pages/home_view/home_view.dart
+++ b/lib/pages/home_view/home_view.dart
@@ -287,7 +287,7 @@ class _HomeViewState extends ConsumerState<HomeView> {
                         (previous, next) {
                       if (next is int) {
                         if (next == 1) {
-                          _loadCNData();
+                          _exchangeDataLoadingService.loadAll(ref);
                         }
                         if (next >= 0 && next <= 1) {
                           _pageController.animateToPage(
diff --git a/lib/pages/home_view/sub_widgets/home_view_button_bar.dart b/lib/pages/home_view/sub_widgets/home_view_button_bar.dart
index 61a6c4185..341fc35da 100644
--- a/lib/pages/home_view/sub_widgets/home_view_button_bar.dart
+++ b/lib/pages/home_view/sub_widgets/home_view_button_bar.dart
@@ -101,10 +101,10 @@ class _HomeViewButtonBarState extends ConsumerState<HomeViewButtonBar> {
                 ref.read(homeViewPageIndexStateProvider.state).state = 1;
               }
               // DateTime now = DateTime.now();
-              if (ref.read(prefsChangeNotifierProvider).externalCalls) {
-                print("loading?");
-                await ExchangeDataLoadingService().loadAll(ref);
-              }
+              // if (ref.read(prefsChangeNotifierProvider).externalCalls) {
+              //   print("loading?");
+              await ExchangeDataLoadingService().loadAll(ref);
+              // }
               // if (now.difference(_lastRefreshed) > _refreshInterval) {
               //   await ExchangeDataLoadingService().loadAll(ref);
               // }
diff --git a/lib/pages/wallet_view/wallet_view.dart b/lib/pages/wallet_view/wallet_view.dart
index 488ed19cd..c84ddf2b9 100644
--- a/lib/pages/wallet_view/wallet_view.dart
+++ b/lib/pages/wallet_view/wallet_view.dart
@@ -37,6 +37,7 @@ import 'package:stackwallet/utilities/enums/backup_frequency_type.dart';
 import 'package:stackwallet/utilities/enums/coin_enum.dart';
 import 'package:stackwallet/utilities/enums/flush_bar_type.dart';
 import 'package:stackwallet/utilities/enums/wallet_balance_toggle_state.dart';
+import 'package:stackwallet/utilities/logger.dart';
 import 'package:stackwallet/utilities/text_styles.dart';
 import 'package:stackwallet/utilities/theme/stack_colors.dart';
 import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
@@ -45,12 +46,6 @@ import 'package:stackwallet/widgets/custom_loading_overlay.dart';
 import 'package:stackwallet/widgets/stack_dialog.dart';
 import 'package:tuple/tuple.dart';
 
-import 'package:stackwallet/hive/db.dart';
-
-import 'package:stackwallet/utilities/logger.dart';
-
-import 'package:stackwallet/utilities/prefs.dart';
-
 /// [eventBus] should only be set during testing
 class WalletView extends ConsumerStatefulWidget {
   const WalletView({
@@ -235,12 +230,8 @@ class _WalletViewState extends ConsumerState<WalletView> {
   }
 
   void _onExchangePressed(BuildContext context) async {
-    final _cnLoadingService = ExchangeDataLoadingService();
-    final externalCalls = Prefs.instance.externalCalls;
-    if (!externalCalls) {
-      print("loading?");
-      unawaited(_cnLoadingService.loadAll(ref));
-    }
+    unawaited(_cnLoadingService.loadAll(ref));
+
     final coin = ref.read(managerProvider).coin;
 
     if (coin == Coin.epicCash) {
@@ -371,9 +362,7 @@ class _WalletViewState extends ConsumerState<WalletView> {
 
   void _loadCNData() {
     // unawaited future
-    final externalCalls = DB.instance
-        .get<dynamic>(boxName: DB.boxNamePrefs, key: "externalCalls") as bool?;
-    if (externalCalls ?? false) {
+    if (ref.read(prefsChangeNotifierProvider).externalCalls) {
       _cnLoadingService.loadAll(ref, coin: ref.read(managerProvider).coin);
     } else {
       Logging.instance.log("User does not want to use external calls",