diff --git a/src/pages/index.tsx b/src/pages/index.tsx
index acc3bffc1fe..eb51177a3bd 100644
--- a/src/pages/index.tsx
+++ b/src/pages/index.tsx
@@ -1,4 +1,5 @@
 import React from 'react'
+import { withErrorBoundary } from './reset-password'
 import { WithIntl } from 'components/localization'
 import HomePage from 'features/pages/home'
 import { SEO } from 'components/containers'
@@ -8,7 +9,8 @@ const Home = () => {
     return <HomePage />
 }
 
-export default WithIntl()(Home)
+export default withErrorBoundary(Home)
+WithIntl()
 
 export const Head = ({ pageContext }: TGatsbyHead) => (
     <SEO
diff --git a/src/pages/reset-password/index.tsx b/src/pages/reset-password/index.tsx
index b16173adc75..2765956534a 100644
--- a/src/pages/reset-password/index.tsx
+++ b/src/pages/reset-password/index.tsx
@@ -39,6 +39,20 @@ const InputGroup = styled.div`
 const StyledButton = styled(Button)`
     margin: 0.8rem 0.4rem;
 `
+export const withErrorBoundary = (WrappedComponent) => {
+    return function ErrorBoundary(props) {
+        const [error, setError] = useState(null)
+        if (error) {
+            return <div>An error occured:{error.toString()}</div>
+        }
+
+        try {
+            return <WrappedComponent {...props} />
+        } catch (err) {
+            setError(err)
+        }
+    }
+}
 
 const ResetPassword = () => {
     const [apiError, setApiError] = useState<string | null>('')