1 files changed, 8 insertions, 5 deletions

diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index 7300a76c8..c38d0d9ee 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -187,13 +187,13 @@ export default class ServicesStore extends Store {
 
       // patch custom icon deletion
       if (data.customIcon === 'delete') {
-        data.iconUrl = '';
-        data.hasCustomUploadedIcon = false;
+        newData.iconUrl = '';
+        newData.hasCustomUploadedIcon = false;
       }
 
       // patch custom icon url
       if (data.customIconUrl) {
-        data.iconUrl = data.customIconUrl;
+        newData.iconUrl = data.customIconUrl;
       }
 
       Object.assign(result.find(c => c.id === serviceId), newData);
@@ -536,7 +536,6 @@ export default class ServicesStore extends Store {
 
     // We can't just block this earlier, otherwise the mobx reaction won't be aware of the vars to watch in some cases
     if (showMessageBadgesEvenWhenMuted) {
-      console.log('set badge', unreadDirectMessageCount, unreadIndirectMessageCount);
       this.actions.app.setBadge({
         unreadDirectMessageCount,
         unreadIndirectMessageCount,
@@ -589,12 +588,16 @@ export default class ServicesStore extends Store {
     const delay = 1000;
 
     if (service) {
+      if (service.timer !== null) {
+        clearTimeout(service.timer);
+      }
+
       const loop = () => {
         if (!service.webview) return;
 
         service.webview.send('poll');
 
-        setTimeout(loop, delay);
+        service.timer = setTimeout(loop, delay);
       };
 
       loop();