diff --git a/governance/src/App.tsx b/governance/src/App.tsx
index d700430d..380ab1d6 100644
--- a/governance/src/App.tsx
+++ b/governance/src/App.tsx
@@ -3,6 +3,12 @@ import { useEffect } from "react";
 import smoothscroll from "smoothscroll-polyfill";
 import "shared/lib/i18n/config";
 
+import {
+  PhantomWalletAdapter,
+  SolflareWalletAdapter,
+} from "@solana/wallet-adapter-wallets";
+
+import { WalletProvider as SolanaWalletProvider, ConnectionProvider } from "@solana/wallet-adapter-react";
 import { SubgraphDataContextProvider } from "shared/lib/hooks/subgraphDataContext";
 import RootApp from "./components/RootApp";
 import { Web3ContextProvider } from "shared/lib/hooks/web3Context";
@@ -15,6 +21,7 @@ import TextPreview from "shared/lib/components/TextPreview/TextPreview";
 import Geoblocked from "shared/lib/components/Geoblocked/Geoblocked";
 import { LoadingText } from "shared/lib/hooks/useLoadingText";
 import { allConnectors } from "shared/lib/utils/wallet/connectors";
+import { getSolanaClusterURI } from "shared/lib/utils/env";
 
 function App() {
   const { loading, rejected } = useGeofence(GeofenceCountry.SINGAPORE);
@@ -34,19 +41,27 @@ function App() {
 
   return (
     <ChainContextProvider>
-      <Web3ContextProvider>
-        <Web3ReactProvider connectors={allConnectors}>
-          <PendingTransactionsContextProvider>
-            <Web3DataContextProvider>
-              <SubgraphDataContextProvider>
-                <ExternalAPIDataContextProvider>
-                  <RootApp />
-                </ExternalAPIDataContextProvider>
-              </SubgraphDataContextProvider>
-            </Web3DataContextProvider>
-          </PendingTransactionsContextProvider>
-        </Web3ReactProvider>
-      </Web3ContextProvider>
+      <ConnectionProvider endpoint={getSolanaClusterURI()}>
+        {/* This is just to prevent useWeb3Wallet from breaking */}
+        <SolanaWalletProvider wallets={[
+          new PhantomWalletAdapter(),
+          new SolflareWalletAdapter(),
+        ]} autoConnect={true}>
+          <Web3ContextProvider>
+            <Web3ReactProvider connectors={allConnectors}>
+              <PendingTransactionsContextProvider>
+                <Web3DataContextProvider>
+                  <SubgraphDataContextProvider>
+                    <ExternalAPIDataContextProvider>
+                      <RootApp />
+                    </ExternalAPIDataContextProvider>
+                  </SubgraphDataContextProvider>
+                </Web3DataContextProvider>
+              </PendingTransactionsContextProvider>
+            </Web3ReactProvider>
+          </Web3ContextProvider>
+        </SolanaWalletProvider>
+      </ConnectionProvider>
     </ChainContextProvider>
   );
 }
diff --git a/shared/src/hooks/useWeb3Wallet.tsx b/shared/src/hooks/useWeb3Wallet.tsx
index 321b8da2..5f4767eb 100644
--- a/shared/src/hooks/useWeb3Wallet.tsx
+++ b/shared/src/hooks/useWeb3Wallet.tsx
@@ -110,6 +110,7 @@ export const useWeb3Wallet = (): Web3WalletData => {
       // Remove last connected wallet from local storage so we don't eagerly connect to anything
       localStorage.removeItem(LAST_CONNECTED_WALLET_LOCAL_STORAGE_KEY);
     } catch (error) {
+      // eslint-disable-next-line no-console
       console.log("Error deactivating", error);
     }
   }, []);