diff --git a/TogglLibrary.js b/TogglLibrary.js
index 2ade7db0e3749f9326f2ffc0269cf4fa32e000de..2b658633345b16f314eac6f2da79214a53813ce4 100644
--- a/TogglLibrary.js
+++ b/TogglLibrary.js
@@ -140,10 +140,8 @@ function TogglButtonGM(selector, renderer) {
             if (result.status === 200) {
               var resp = JSON.parse(result.responseText),
                 data = resp.data || false;
-              if (data) {
-                for (i in $instances) {
-                  $instances[i].checkCurrentLinkStatus(data);
-                }
+              for (i in $instances) {
+                $instances[i].checkCurrentLinkStatus(data);
               }
             }
           }
@@ -450,12 +448,13 @@ function TogglButtonGM(selector, renderer) {
           "Authorization": "Basic " + btoa($api_token + ':api_token')
         },
         onload: function (result) {
+          $curEntryId = null;
           document.dispatchEvent(new CustomEvent('TogglButtonGMUpdateStatus'));
           if (result.status === 200) {
             var resp = JSON.parse(result.responseText),
               data = resp.data || false;
             if (data) {
-              if ($stopCallback !== undefined) {
+              if ($stopCallback !== undefined && $stopCallback !== null) {
                 var currentdate = new Date();
                 $stopCallback((currentdate.getTime() - (data.duration * 1000)), data.duration);
               }