diff --git a/client/main.tsx b/client/main.tsx
index 09b47ac0..7003e6fa 100644
--- a/client/main.tsx
+++ b/client/main.tsx
@@ -1,6 +1,7 @@
 import { StrictMode } from 'react';
 import { createRoot } from 'react-dom/client';
 import App from './App';
+import ErrorBoundary from './components/ErrorBoundary';
 
 const container = document.getElementById('root');
 if (!container) {
@@ -10,6 +11,8 @@ if (!container) {
 const root = createRoot(container);
 root.render(
   <StrictMode>
-    <App />
+    <ErrorBoundary>
+      <App />
+    </ErrorBoundary>
   </StrictMode>
 );