diff --git a/viz/src/App.tsx b/viz/src/App.tsx
index c1905da..7c8e202 100644
--- a/viz/src/App.tsx
+++ b/viz/src/App.tsx
@@ -2,15 +2,18 @@ import "./App.css";
 import { BrowserRouter as Router, Route, Routes } from "react-router-dom";
 import LandingPage from "./components/LandingPage";
 import SAEVisualizer from "./SAEVisualizer";
+import ErrorBoundary from "./components/ErrorBoundary";
 
 function App() {
   return (
-    <Router>
-      <Routes>
-        <Route path="/" element={<LandingPage />} />
-        <Route path="/sae-visualizer" element={<SAEVisualizer />} />
-      </Routes>
-    </Router>
+    <ErrorBoundary>
+      <Router>
+        <Routes>
+          <Route path="/" element={<LandingPage />} />
+          <Route path="/sae-visualizer" element={<SAEVisualizer />} />
+        </Routes>
+      </Router>
+    </ErrorBoundary>
   );
 }
 
diff --git a/viz/src/components/ErrorBoundary.tsx b/viz/src/components/ErrorBoundary.tsx
new file mode 100644
index 0000000..c4cfea2
--- /dev/null
+++ b/viz/src/components/ErrorBoundary.tsx
@@ -0,0 +1,43 @@
+import { Component, ErrorInfo, ReactNode } from "react";
+
+interface Props {
+  children: ReactNode;
+  fallback?: ReactNode;
+}
+
+interface State {
+  hasError: boolean;
+  error?: Error;
+}
+
+class ErrorBoundary extends Component<Props, State> {
+  public state: State = {
+    hasError: false,
+  };
+
+  public static getDerivedStateFromError(error: Error): State {
+    return { hasError: true, error };
+  }
+
+  public componentDidCatch(error: Error, errorInfo: ErrorInfo) {
+    console.error("Error caught by boundary:", error);
+    console.error("Error info:", errorInfo);
+  }
+
+  public render() {
+    if (this.state.hasError) {
+      return (
+        this.props.fallback || (
+          <div className="p-4 rounded-lg bg-red-50 border border-red-200">
+            <h2 className="text-red-800 font-semibold mb-2">Something went wrong</h2>
+            <p className="text-red-600">{this.state.error?.message}</p>
+          </div>
+        )
+      );
+    }
+
+    return this.props.children;
+  }
+}
+
+export default ErrorBoundary;