diff --git a/common/src/main/java/org/red5/server/scheduling/JDKSchedulingServiceJob.java b/common/src/main/java/org/red5/server/scheduling/JDKSchedulingServiceJob.java
index 012205a405a80d6472ae5511e238661a2cffdcdc..92053cc8af171aaaf42843bb63fcefc03d699c3b 100644
--- a/common/src/main/java/org/red5/server/scheduling/JDKSchedulingServiceJob.java
+++ b/common/src/main/java/org/red5/server/scheduling/JDKSchedulingServiceJob.java
@@ -65,9 +65,10 @@ public class JDKSchedulingServiceJob implements Runnable {
             // remove the job
             if (autoRemove) {
                 service.removeScheduledJob(jobName);
+                // clear the map
+                jobDataMap.clear();
             }
-            // clear the map
-            jobDataMap.clear();
+
         }
     }