diff --git a/uplink-client/src/providers/TransmissionsProvider.tsx b/uplink-client/src/providers/TransmissionsProvider.tsx
index 8d4a3642..f908f898 100644
--- a/uplink-client/src/providers/TransmissionsProvider.tsx
+++ b/uplink-client/src/providers/TransmissionsProvider.tsx
@@ -17,21 +17,30 @@ const TxProvider = ({ children }: { children: React.ReactNode }) => {
 }
 
 const TransmissionsClientProvider = ({ children }: { children: React.ReactNode }) => {
-    const chainId = useChainId();
+
     const { data: walletClient, status } = useWalletClient();
     const publicClient = usePublicClient();
 
-    const transmissionsClientConfig = useMemo(() => ({
-        chainId: SUPPORTED_CHAIN_IDS.includes(chainId) ? chainId : 8453,
-        walletClient: walletClient,
-        publicClient: publicClient,
-        apiConfig: {
-            serverUrl: getSubgraphUrl(chainId),
-        },
-        paymasterConfig: {
-            paymasterUrl: process.env.NODE_ENV === "production" ? `${process.env.NEXT_PUBLIC_HUB_URL}/v2/paymaster_proxy` : 'https://paymaster.base.org',
+    const transmissionsClientConfig = useMemo(() => {
+
+        const chainId = walletClient?.chain?.id;
+
+        if (!chainId || !SUPPORTED_CHAIN_IDS.includes(chainId)) {
+            return undefined;
         }
-    }), [chainId, walletClient, publicClient]);
+
+        return {
+            chainId,
+            walletClient,
+            publicClient,
+            apiConfig: {
+                serverUrl: getSubgraphUrl(chainId),
+            },
+            paymasterConfig: {
+                paymasterUrl: process.env.NODE_ENV === "production" ? `${process.env.NEXT_PUBLIC_HUB_URL}/v2/paymaster_proxy` : 'https://paymaster.base.org',
+            },
+        };
+    }, [walletClient, publicClient]);
 
     useTransmissionsClient(transmissionsClientConfig);
 
diff --git a/uplink-client/src/providers/WalletProvider.tsx b/uplink-client/src/providers/WalletProvider.tsx
index 91c750d7..d6813e9e 100644
--- a/uplink-client/src/providers/WalletProvider.tsx
+++ b/uplink-client/src/providers/WalletProvider.tsx
@@ -65,6 +65,7 @@ export default function WalletProvider({
             <RainbowKitProvider
               theme={darkTheme()}
               modalSize="compact"
+              initialChain={base}
             // avatar={(user) => <UserAvatar user={user} size={160} styleOverride="flex items-center rounded-full overflow-hidden p-2.5" />}
             >
               <TxProvider>