diff --git a/packages/module/src/ErrorBoundary/ErrorBoundary.tsx b/packages/module/src/ErrorBoundary/ErrorBoundary.tsx
index b991e091..9a35a509 100644
--- a/packages/module/src/ErrorBoundary/ErrorBoundary.tsx
+++ b/packages/module/src/ErrorBoundary/ErrorBoundary.tsx
@@ -41,15 +41,24 @@ class ErrorBoundary extends React.Component<React.PropsWithChildren<ErrorPagePro
     return { hasError: true, error, historyState: history.state };
   }
 
-  render() {
-
+  updateState = () => {
     if (this.state.historyState !== history.state) {
       this.setState({
         hasError: false,
         historyState: history.state,
       });
     }
+  };
+
+  componentDidUpdate(): void {
+    this.updateState();
+  }
 
+  componentDidMount(): void {
+    this.updateState();
+  }
+
+  render() {
     if (this.state.hasError) {
       if (this.props.silent) {
         return null;