diff --git a/mobile-app/app/screens/AppNavigator/screens/Settings/screens/ServiceProviderScreen.tsx b/mobile-app/app/screens/AppNavigator/screens/Settings/screens/ServiceProviderScreen.tsx
index 6fe6cc80d4..e12fb10b81 100644
--- a/mobile-app/app/screens/AppNavigator/screens/Settings/screens/ServiceProviderScreen.tsx
+++ b/mobile-app/app/screens/AppNavigator/screens/Settings/screens/ServiceProviderScreen.tsx
@@ -192,7 +192,12 @@ export function ServiceProviderScreen({ navigation }: Props): JSX.Element {
         ))}
       </View>
       {showActionButtons && (
-        <View style={tailwind("mt-48", { "mt-36": isSmallScreen })}>
+        <View
+          style={tailwind("mt-48", {
+            "mt-36": isSmallScreen,
+            "mt-10": customProviders.length > 1,
+          })}
+        >
           <View style={tailwind("mt-2 px-5 mb-5")}>
             <Text
               style={tailwind(
diff --git a/shared/contexts/WalletDataProvider.tsx b/shared/contexts/WalletDataProvider.tsx
index 3bd6b686b5..8ddbbfc61c 100644
--- a/shared/contexts/WalletDataProvider.tsx
+++ b/shared/contexts/WalletDataProvider.tsx
@@ -18,7 +18,7 @@ import { useFeatureFlagContext } from "@contexts/FeatureFlagContext";
 import { useWhaleApiClient } from "@waveshq/walletkit-ui/dist/contexts";
 
 export function WalletDataProvider(
-  props: PropsWithChildren<any>
+  props: PropsWithChildren<any>,
 ): JSX.Element | null {
   const blockCount = useSelector((state: RootState) => state.block.count);
   const client = useWhaleApiClient();
@@ -36,7 +36,7 @@ export function WalletDataProvider(
         fetchDexPrice({
           client,
           denomination: "USDT",
-        })
+        }),
       );
     });
   }, [blockCount, network]);
@@ -47,7 +47,7 @@ export function WalletDataProvider(
     if (isFeatureAvailable("local_storage")) {
       dispatch(fetchUserPreferences(network));
     }
-  }, [network, wallets]);
+  }, [network, wallets, isFeatureAvailable]);
 
   /* Global polling based on blockCount, network and address */
   useEffect(() => {
@@ -56,13 +56,13 @@ export function WalletDataProvider(
         fetchTokens({
           client,
           address,
-        })
+        }),
       );
       dispatch(
         fetchVaults({
           client,
           address,
-        })
+        }),
       );
     });
   }, [blockCount, network, address]);