diff --git a/app/aem/core/src/main/java/com/cognifide/apm/core/scripts/ScriptFilters.java b/app/aem/core/src/main/java/com/cognifide/apm/core/scripts/ScriptFilters.java
index 820e28a3..ee6e46ee 100644
--- a/app/aem/core/src/main/java/com/cognifide/apm/core/scripts/ScriptFilters.java
+++ b/app/aem/core/src/main/java/com/cognifide/apm/core/scripts/ScriptFilters.java
@@ -23,6 +23,7 @@
 import com.cognifide.apm.api.scripts.LaunchMode;
 import com.cognifide.apm.api.scripts.Script;
 import com.cognifide.apm.api.services.RunModesProvider;
+import java.util.Date;
 import java.util.Set;
 import java.util.function.Predicate;
 import org.apache.commons.lang3.StringUtils;
@@ -94,11 +95,14 @@ private static Predicate<Script> withLaunchMode(LaunchMode mode) {
   }
 
   private static Predicate<Script> withSchedule() {
-    return script -> script.getLaunchMode() == LaunchMode.ON_SCHEDULE && script.getLaunchSchedule() != null;
+    return script -> script.getLaunchMode() == LaunchMode.ON_SCHEDULE
+        && script.getLaunchSchedule() != null
+        && script.getLaunchSchedule().after(new Date());
   }
 
   private static Predicate<Script> withCronExpression() {
-    return script -> script.getLaunchMode() == LaunchMode.ON_CRON_EXPRESSION && StringUtils.isNotEmpty(script.getLaunchCronExpression());
+    return script -> script.getLaunchMode() == LaunchMode.ON_CRON_EXPRESSION
+        && StringUtils.isNotEmpty(script.getLaunchCronExpression());
   }
 
   private static Predicate<Script> enabled() {
diff --git a/app/aem/core/src/main/java/com/cognifide/apm/core/services/ScriptsResourceChangeListener.java b/app/aem/core/src/main/java/com/cognifide/apm/core/services/ScriptsResourceChangeListener.java
index 89c508aa..705c384e 100644
--- a/app/aem/core/src/main/java/com/cognifide/apm/core/services/ScriptsResourceChangeListener.java
+++ b/app/aem/core/src/main/java/com/cognifide/apm/core/services/ScriptsResourceChangeListener.java
@@ -132,7 +132,7 @@ public void onChange(List<ResourceChange> changes) {
                 if (onScheduleOrCronExpression(runModesProvider).test(script)) {
                   registerScript(script, bundleContext);
                 }
-              } else if (!Objects.equals(script, registeredScript.script)) {
+              } else if (!Objects.equals(script, registeredScript.script) || script.getLaunchMode() == LaunchMode.ON_SCHEDULE) {
                 registeredScript.registration.unregister();
                 registeredScripts.remove(change.getPath());
                 if (onScheduleOrCronExpression(runModesProvider).test(script)) {