diff --git a/apps/andark/ChangeLog b/apps/andark/ChangeLog
index 72c3404cae..fa89d56187 100644
--- a/apps/andark/ChangeLog
+++ b/apps/andark/ChangeLog
@@ -6,4 +6,4 @@
       add settings for widgets, order of drawing and hour hand length
 0.06: Fix issue showing widgets when app is fast-loaded into from launcher with widgets disabled
 0.07: Enable fast loading and queue updates to the second
-0.08: Restore redraw on charging event
+0.08: Restore redraw on charging event + fixup for safer fast-loading
diff --git a/apps/andark/app.js b/apps/andark/app.js
index 0fbe733c98..48b5e4f86f 100644
--- a/apps/andark/app.js
+++ b/apps/andark/app.js
@@ -135,11 +135,12 @@ let drawScale = function() {
 Bangle.setUI({
   mode: "clock",
   remove: function() {
-    if (drawTimeout) clearTimeout(drawTimeout);
-    drawTimeout = undefined;
     Bangle.removeListener('lcdPower', updateState);
     Bangle.removeListener('lock', updateState);
     Bangle.removeListener('charging', draw);
+    // We clear drawTimout after removing all listeners, because they can add one again
+    if (drawTimeout) clearTimeout(drawTimeout);
+    drawTimeout = undefined;
     require("widget_utils").show();
   }
 });