diff --git a/www/src/App.tsx b/www/src/App.tsx
index ffee6a2e..4e18271d 100644
--- a/www/src/App.tsx
+++ b/www/src/App.tsx
@@ -2,7 +2,7 @@ import React, { lazy, Suspense } from "react";
 import { Route, Switch, Link } from "react-router-dom";
 import _merge from "lodash/merge";
 
-import { CssBaseline, Button } from "@material-ui/core";
+import { Button } from "@material-ui/core";
 
 import CustomBrowserRouter from "./utils/CustomBrowserRouter";
 import PrivateRoute from "./utils/PrivateRoute";
diff --git a/www/src/contexts/AppContext.tsx b/www/src/contexts/AppContext.tsx
index eb031ed6..a394098a 100644
--- a/www/src/contexts/AppContext.tsx
+++ b/www/src/contexts/AppContext.tsx
@@ -12,6 +12,8 @@ import {
 } from "@material-ui/core";
 import Themes from "Themes";
 
+import ErrorBoundary from "components/ErrorBoundary";
+
 const useThemeState = createPersistedState("_FT_THEME");
 const useThemeOverriddenState = createPersistedState("_FT_THEME_OVERRIDDEN");
 
@@ -124,7 +126,7 @@ export const AppProvider: React.FC = ({ children }) => {
     >
       <MuiThemeProvider theme={generatedTheme}>
         <CssBaseline />
-        {children}
+        <ErrorBoundary>{children}</ErrorBoundary>
       </MuiThemeProvider>
     </AppContext.Provider>
   );