diff --git a/src/containers/monitor-list.jsx b/src/containers/monitor-list.jsx
index 85a3b20e3ec840808e27b99f7c81b6a338022cf4..b3dcd5b7c7cfb2943f27caab43a0ff80191037ce 100644
--- a/src/containers/monitor-list.jsx
+++ b/src/containers/monitor-list.jsx
@@ -5,6 +5,8 @@ import PropTypes from 'prop-types';
 import {connect} from 'react-redux';
 import {moveMonitorRect} from '../reducers/monitor-layout';
 
+import errorBoundaryHOC from '../lib/error-boundary-hoc.jsx';
+
 import MonitorListComponent from '../components/monitor-list/monitor-list.jsx';
 
 class MonitorList extends React.Component {
@@ -37,7 +39,9 @@ const mapDispatchToProps = dispatch => ({
     moveMonitorRect: (id, x, y) => dispatch(moveMonitorRect(id, x, y))
 });
 
-export default connect(
-    mapStateToProps,
-    mapDispatchToProps
-)(MonitorList);
+export default errorBoundaryHOC('Monitors')(
+    connect(
+        mapStateToProps,
+        mapDispatchToProps
+    )(MonitorList)
+);