diff --git a/src/cron.js b/src/cron.js
index 8892e031e..6d315ebd5 100644
--- a/src/cron.js
+++ b/src/cron.js
@@ -149,6 +149,9 @@ function uninitialize(callback) {
 
     cloudron.events.removeListener(cloudron.EVENT_ACTIVATED, recreateJobs);
 
+    settings.events.removeListener(settings.TIME_ZONE_KEY, recreateJobs);
+    settings.events.removeListener(settings.AUTOUPDATE_PATTERN_KEY, autoupdatePatternChanged);
+
     if (gAutoupdaterJob) gAutoupdaterJob.stop();
     gAutoupdaterJob = null;
 
diff --git a/src/taskmanager.js b/src/taskmanager.js
index 1c6d07a58..3ae845673 100644
--- a/src/taskmanager.js
+++ b/src/taskmanager.js
@@ -43,6 +43,7 @@ function uninitialize(callback) {
         stopAppTask(appId);
     }
 
+    cloudron.events.removeListener(cloudron.EVENT_ACTIVATED, resumeTasks);
     locker.removeListener('unlocked', startNextTask);
 
     callback(null);