1 files changed, 17 insertions, 14 deletions

diff --git a/src/containers/settings/ServicesScreen.js b/src/containers/settings/ServicesScreen.js
index c1a133ef7..b70a5506e 100644
--- a/src/containers/settings/ServicesScreen.js
+++ b/src/containers/settings/ServicesScreen.js
@@ -9,6 +9,7 @@ import ServiceStore from '../../stores/ServicesStore';
 import { gaPage } from '../../lib/analytics';
 
 import ServicesDashboard from '../../components/settings/services/ServicesDashboard';
+import ErrorBoundary from '../../components/util/ErrorBoundary';
 
 export default @inject('stores', 'actions') @observer class ServicesScreen extends Component {
   componentDidMount() {
@@ -40,20 +41,22 @@ export default @inject('stores', 'actions') @observer class ServicesScreen exten
     }
 
     return (
-      <ServicesDashboard
-        user={user.data}
-        services={allServices}
-        status={services.actionStatus}
-        deleteService={() => this.deleteService()}
-        toggleService={toggleService}
-        isLoading={isLoading}
-        filterServices={filter}
-        resetFilter={resetFilter}
-        goTo={router.push}
-        servicesRequestFailed={services.allServicesRequest.wasExecuted && services.allServicesRequest.isError}
-        retryServicesRequest={() => services.allServicesRequest.reload()}
-        searchNeedle={services.filterNeedle}
-      />
+      <ErrorBoundary>
+        <ServicesDashboard
+          user={user.data}
+          services={allServices}
+          status={services.actionStatus}
+          deleteService={() => this.deleteService()}
+          toggleService={toggleService}
+          isLoading={isLoading}
+          filterServices={filter}
+          resetFilter={resetFilter}
+          goTo={router.push}
+          servicesRequestFailed={services.allServicesRequest.wasExecuted && services.allServicesRequest.isError}
+          retryServicesRequest={() => services.allServicesRequest.reload()}
+          searchNeedle={services.filterNeedle}
+        />
+      </ErrorBoundary>
     );
   }
 }