diff --git a/UI/WebServerResources/js/Scheduler/Component.service.js b/UI/WebServerResources/js/Scheduler/Component.service.js
index c0821211a..2ff2045fc 100644
--- a/UI/WebServerResources/js/Scheduler/Component.service.js
+++ b/UI/WebServerResources/js/Scheduler/Component.service.js
@@ -579,7 +579,8 @@
       this.repeat.end = 'count';
     else if (this.repeat.until) {
       this.repeat.end = 'until';
-      this.repeat.until = Component.$parseDate(this.repeat.until, { no_time: true });
+      if (angular.isString(this.repeat.until))
+        this.repeat.until = Component.$parseDate(this.repeat.until, { no_time: true });
     }
     else
       this.repeat.end = 'never';