3 files changed, 8 insertions, 0 deletions

diff --git a/src/actions/service.js b/src/actions/service.js
index cdd4bbf16..ea6ea5acc 100644
--- a/src/actions/service.js
+++ b/src/actions/service.js
@@ -63,6 +63,7 @@ export default {
     needle: PropTypes.string.isRequired,
   },
   resetFilter: {},
+  resetStatus: {},
   reorder: {
     oldIndex: PropTypes.number.isRequired,
     newIndex: PropTypes.number.isRequired,
diff --git a/src/containers/settings/ServicesScreen.js b/src/containers/settings/ServicesScreen.js
index d0580041f..8cfe5efbf 100644
--- a/src/containers/settings/ServicesScreen.js
+++ b/src/containers/settings/ServicesScreen.js
@@ -18,6 +18,7 @@ export default class ServicesScreen extends Component {
 
   componentWillUnmount() {
     this.props.actions.service.resetFilter();
+    this.props.actions.service.resetStatus();
   }
 
   deleteService() {
@@ -70,6 +71,7 @@ ServicesScreen.wrappedComponent.propTypes = {
       toggleService: PropTypes.func.isRequired,
       filter: PropTypes.func.isRequired,
       resetFilter: PropTypes.func.isRequired,
+      resetStatus: PropTypes.func.isRequired,
     }).isRequired,
   }).isRequired,
 };
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index 4510146e0..64e6bb42b 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -41,6 +41,7 @@ export default class ServicesStore extends Store {
     this.actions.service.openWindow.listen(this._openWindow.bind(this));
     this.actions.service.filter.listen(this._filter.bind(this));
     this.actions.service.resetFilter.listen(this._resetFilter.bind(this));
+    this.actions.service.resetStatus.listen(this._resetStatus.bind(this));
     this.actions.service.reload.listen(this._reload.bind(this));
     this.actions.service.reloadActive.listen(this._reloadActive.bind(this));
     this.actions.service.reloadAll.listen(this._reloadAll.bind(this));
@@ -338,6 +339,10 @@ export default class ServicesStore extends Store {
     this.filterNeedle = null;
   }
 
+  @action _resetStatus() {
+    this.actionStatus = [];
+  }
+
   @action _reload({ serviceId }) {
     const service = this.one(serviceId);
     service.resetMessageCount();