diff --git a/src/app/providers.tsx b/src/app/providers.tsx
index 29283d8..3c754a3 100644
--- a/src/app/providers.tsx
+++ b/src/app/providers.tsx
@@ -5,7 +5,7 @@ import dynamic from "next/dynamic";
 import type { Session } from "next-auth"
 import { SessionProvider } from "next-auth/react"
 import { FrameProvider } from "~/components/providers/FrameProvider";
-import { SolanaWalletDemo } from "../components/SolanaWalletDemo";
+import { SafeFarcasterSolanaProvider } from "~/components/providers/SafeFarcasterSolanaProvider";
 
 const WagmiProvider = dynamic(
   () => import("~/components/providers/WagmiProvider"),
@@ -14,21 +14,15 @@ const WagmiProvider = dynamic(
   }
 );
 
-const FarcasterSolanaProvider = dynamic(
-  () => import('@farcaster/mini-app-solana').then(mod => mod.FarcasterSolanaProvider),
-  { ssr: false }
-);
-
 export function Providers({ session, children }: { session: Session | null, children: React.ReactNode }) {
   const solanaEndpoint = process.env.SOLANA_RPC_ENDPOINT || "https://solana-rpc.publicnode.com";
   return (
     <SessionProvider session={session}>
       <WagmiProvider>
         <FrameProvider>
-          <FarcasterSolanaProvider endpoint={solanaEndpoint}>
-            <SolanaWalletDemo />
+          <SafeFarcasterSolanaProvider endpoint={solanaEndpoint}>
             {children}
-          </FarcasterSolanaProvider>
+          </SafeFarcasterSolanaProvider>
         </FrameProvider>
       </WagmiProvider>
     </SessionProvider>
diff --git a/tester b/tester
new file mode 160000
index 0000000..9348ae0
--- /dev/null
+++ b/tester
@@ -0,0 +1 @@
+Subproject commit 9348ae06294c4e959b60ef444b2c282720786359