diff --git a/app/components/DynamicMainApp.tsx b/app/components/DynamicMainApp.tsx
deleted file mode 100644
index 4a1e024..0000000
--- a/app/components/DynamicMainApp.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-'use client';
-
-import dynamic from 'next/dynamic';
-import { Center, Spinner } from '@chakra-ui/react';
-import ClientOnly from './ClientOnly';
-
-const MainApp = dynamic(() => import('./MainApp'), {
-  ssr: false,
-  loading: () => (
-    <Center h="100vh">
-      <Spinner size="xl" />
-    </Center>
-  ),
-});
-
-export default function DynamicMainApp() {
-  return (
-    <ClientOnly>
-      <MainApp />
-    </ClientOnly>
-  );
-} 
\ No newline at end of file
diff --git a/app/components/MainAppWrapper.tsx b/app/components/MainAppWrapper.tsx
new file mode 100644
index 0000000..822bb2f
--- /dev/null
+++ b/app/components/MainAppWrapper.tsx
@@ -0,0 +1,31 @@
+'use client';
+
+import { useEffect, useState } from 'react';
+import dynamic from 'next/dynamic';
+import { Center, Spinner } from '@chakra-ui/react';
+
+const MainApp = dynamic(() => import('./MainApp'), {
+  loading: () => (
+    <Center h="100vh">
+      <Spinner size="xl" />
+    </Center>
+  ),
+});
+
+export default function MainAppWrapper() {
+  const [isMounted, setIsMounted] = useState(false);
+
+  useEffect(() => {
+    setIsMounted(true);
+  }, []);
+
+  if (!isMounted) {
+    return (
+      <Center h="100vh">
+        <Spinner size="xl" />
+      </Center>
+    );
+  }
+
+  return <MainApp />;
+} 
\ No newline at end of file
diff --git a/app/page.tsx b/app/page.tsx
index 956f1b8..d8eeb6b 100644
--- a/app/page.tsx
+++ b/app/page.tsx
@@ -1,5 +1,17 @@
-import DynamicMainApp from './components/DynamicMainApp';
+import { Suspense } from 'react';
+import { Center, Spinner } from '@chakra-ui/react';
+import MainAppWrapper from './components/MainAppWrapper';
 
 export default function Home() {
-  return <DynamicMainApp />;
+  return (
+    <Suspense
+      fallback={
+        <Center h="100vh">
+          <Spinner size="xl" />
+        </Center>
+      }
+    >
+      <MainAppWrapper />
+    </Suspense>
+  );
 } 
\ No newline at end of file