diff --git a/src/main/java/org/olat/core/commons/services/taskexecutor/manager/TaskExecutorManagerImpl.java b/src/main/java/org/olat/core/commons/services/taskexecutor/manager/TaskExecutorManagerImpl.java
index 14213bc6b463a5e390598561a64b8f6f68443ab2..8476ec56519f1c915fdb4e3d53c9d0f93407f689 100644
--- a/src/main/java/org/olat/core/commons/services/taskexecutor/manager/TaskExecutorManagerImpl.java
+++ b/src/main/java/org/olat/core/commons/services/taskexecutor/manager/TaskExecutorManagerImpl.java
@@ -112,6 +112,7 @@ public class TaskExecutorManagerImpl implements TaskExecutorManager {
 	}
 
 	public void shutdown() {
+		timer.cancel();
 		taskExecutor.shutdownNow();
 		sequentialTaskExecutor.shutdownNow();
 		lowPriorityTaskExecutor.shutdownNow();