diff --git a/src/networks/goerli.ts b/src/networks/goerli.ts
index c5dc8dee34d..771b45f5d3b 100644
--- a/src/networks/goerli.ts
+++ b/src/networks/goerli.ts
@@ -34,7 +34,7 @@ export const getGoerliNetworkObject = (): NetworkProperties => {
 
       // not sure if flashbots is being used app wide vs just swaps
       flashbots: false,
-      walletconnect: true,
+      walletconnect: false,
       swaps: false,
       nfts: false,
       savings: true,
diff --git a/src/screens/ExchangeModal.tsx b/src/screens/ExchangeModal.tsx
index 2bbf74dd8c6..c2ed44d10fc 100644
--- a/src/screens/ExchangeModal.tsx
+++ b/src/screens/ExchangeModal.tsx
@@ -229,6 +229,7 @@ export default function ExchangeModal({
     accountAddress,
     flashbotsEnabled,
     nativeCurrency,
+    network,
   } = useAccountSettings();
 
   const [isAuthorizing, setIsAuthorizing] = useState(false);
@@ -280,7 +281,9 @@ export default function ExchangeModal({
       outputCurrency?.type
     );
     const chainId =
-      inputCurrency?.type || outputCurrency?.type
+      network === Network.goerli
+        ? getNetworkObj(Network.goerli).id
+        : inputCurrency?.type || outputCurrency?.type
         ? ethereumUtils.getChainIdFromType(
             inputCurrency?.type ?? outputCurrency?.type
           )
diff --git a/src/screens/SendSheet.js b/src/screens/SendSheet.js
index 5170c4d9c43..5f5eeaf3f10 100644
--- a/src/screens/SendSheet.js
+++ b/src/screens/SendSheet.js
@@ -351,9 +351,15 @@ export default function SendSheet(props) {
         const selectedNetwork = isNft
           ? selected.network
           : ethereumUtils.getNetworkFromType(selected.type);
-        setCurrentNetwork(selectedNetwork);
-        provider = await getProviderForNetwork(selectedNetwork);
-        setCurrentProvider(provider);
+        if (network === Network.goerli) {
+          setCurrentNetwork(Network.goerli);
+          provider = await getProviderForNetwork(Network.goerli);
+          setCurrentProvider(provider);
+        } else {
+          setCurrentNetwork(selectedNetwork);
+          provider = await getProviderForNetwork(selectedNetwork);
+          setCurrentProvider(provider);
+        }
       }
     };
     updateNetworkAndProvider();
diff --git a/src/screens/WalletScreen/index.tsx b/src/screens/WalletScreen/index.tsx
index 738fb40b955..ac77df5e0e3 100644
--- a/src/screens/WalletScreen/index.tsx
+++ b/src/screens/WalletScreen/index.tsx
@@ -86,7 +86,7 @@ export const WalletScreen: React.FC<Props> = ({ navigation, route }) => {
   }, [dispatch, initializeAccountData, loadAccountData, resetAccountState]);
 
   useEffect(() => {
-    const supportedNetworks = [Network.mainnet, Network.goerli];
+    const supportedNetworks = [Network.mainnet];
     if (!supportedNetworks.includes(currentNetwork)) {
       revertToMainnet();
     }