diff --git a/packages/react-components/src/Modal/index.tsx b/packages/react-components/src/Modal/index.tsx
index 61638164a7..16c15a9f4f 100644
--- a/packages/react-components/src/Modal/index.tsx
+++ b/packages/react-components/src/Modal/index.tsx
@@ -7,6 +7,7 @@ import styled, { createGlobalStyle } from 'styled-components';
 
 import { useTheme } from '@polkadot/react-hooks';
 
+import ErrorBoundary from '../ErrorBoundary';
 import Actions from './Actions';
 import Columns from './Columns';
 import Content from './Content';
@@ -55,7 +56,9 @@ function ModalBase ({ children, className = '', header, onClose, size = 'medium'
           header={header}
           onClose={onClose}
         />
-        {children}
+        <ErrorBoundary>
+          {children}
+        </ErrorBoundary>
       </div>
     </StyledDiv>,
     document.body