diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
index c16875109..857c77871 100644
--- a/.github/workflows/preview.yml
+++ b/.github/workflows/preview.yml
@@ -98,6 +98,7 @@ jobs:
         env:
           PUBLIC_URL: "/${{ env._BRANCH_NAME_SHA }}"
           NODE_OPTIONS: "--max-old-space-size=10240"
+          REACT_APP_BASE_URL: /${{ env._BRANCH_NAME_SHA }}
           REACT_APP_CLUSTER: ${{ vars.REACT_APP_CLUSTER }}
           REACT_APP_SOLANA_API_URL: ${{ vars.REACT_APP_SOLANA_API_URL }}
           REACT_APP_COVALENT_API_KEY: ${{ secrets.REACT_APP_COVALENT_API_KEY }}
diff --git a/.github/workflows/testnet.yml b/.github/workflows/testnet.yml
index eb5e9e040..bba019cd0 100644
--- a/.github/workflows/testnet.yml
+++ b/.github/workflows/testnet.yml
@@ -68,6 +68,7 @@ jobs:
         env:
           PUBLIC_URL: "/${{ env._BRANCH_NAME_SHA }}"
           NODE_OPTIONS: "--max-old-space-size=10240"
+          REACT_APP_BASE_URL: /${{ env._BRANCH_NAME_SHA }}
           REACT_APP_CLUSTER: testnet
           REACT_APP_SOLANA_API_URL: ${{ vars.REACT_APP_SOLANA_API_URL }}
           REACT_APP_COVALENT_API_KEY: ${{ secrets.REACT_APP_COVALENT_API_KEY }}
diff --git a/src/App.tsx b/src/App.tsx
index 7c2cb295c..23f2d8252 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -207,7 +207,7 @@ function App() {
       >
         <Toolbar>
           <Link
-            href={`${process.env.REACT_APP_BASE_URL}`}
+            href={`${process.env.REACT_APP_BASE_URL}/`}
             className={classes.brandLink}
           >
             <img src={Portal} alt="Portal" className={classes.wormholeIcon} />
@@ -216,7 +216,7 @@ function App() {
           <Hidden implementation="css" xsDown>
             <div style={{ display: "flex", alignItems: "center" }}>
               <Link
-                href={`${process.env.REACT_APP_BASE_URL}`}
+                href={`${process.env.REACT_APP_BASE_URL}/`}
                 color="inherit"
                 className={classes.link}
               >
@@ -247,7 +247,7 @@ function App() {
                 Cosmos
               </Link>
               <Link
-                href={`${process.env.REACT_APP_BASE_URL}docs`}
+                href={`${process.env.REACT_APP_BASE_URL}/docs`}
                 target="_blank"
                 rel="noopener noreferrer"
                 color="inherit"
diff --git a/src/contexts/SolanaWalletContext.tsx b/src/contexts/SolanaWalletContext.tsx
index aa75e8812..1a9817a9c 100644
--- a/src/contexts/SolanaWalletContext.tsx
+++ b/src/contexts/SolanaWalletContext.tsx
@@ -36,7 +36,7 @@ export const getWrappedWallets = (): Wallet[] => {
     new TorusWalletAdapter(),
     new ExodusWalletAdapter(),
     new BraveWalletAdapter(),
-    new BloctoWalletAdapter()
+    new BloctoWalletAdapter(),
   ];
 
   const network =