diff --git a/interface/src/i18n/de/index.ts b/interface/src/i18n/de/index.ts
index b10e879aa..cf62347e8 100644
--- a/interface/src/i18n/de/index.ts
+++ b/interface/src/i18n/de/index.ts
@@ -311,7 +311,6 @@ const de: Translation = {
   LEAVE: 'Leave', // TODO translate
   SCHEDULER: 'Scheduler', // TODO translate
   SCHEDULER_HELP_1: 'Add custom scheduled commands to automate EMS-ESP', // TODO translate
-  SCHEDULER_HELP_2: 'Note: The NTP service needs to be active if using the calendar', // TODO translate
   SCHEDULE: 'Schedule', // TODO translate
   TIME: 'Time', // TODO translate
   TIMER: 'Timer', // TODO translate
diff --git a/interface/src/i18n/en/index.ts b/interface/src/i18n/en/index.ts
index 1f484be66..dc0abb8ea 100644
--- a/interface/src/i18n/en/index.ts
+++ b/interface/src/i18n/en/index.ts
@@ -311,7 +311,6 @@ const en: Translation = {
   LEAVE: 'Leave',
   SCHEDULER: 'Scheduler',
   SCHEDULER_HELP_1: 'Add custom scheduled commands to automate EMS-ESP',
-  SCHEDULER_HELP_2: 'Note: The NTP service needs to be active if using the calendar',
   SCHEDULE: 'Schedule',
   TIME: 'Time',
   TIMER: 'Timer',
diff --git a/interface/src/i18n/fr/index.ts b/interface/src/i18n/fr/index.ts
index cb6c4502b..29e7e9fbf 100644
--- a/interface/src/i18n/fr/index.ts
+++ b/interface/src/i18n/fr/index.ts
@@ -311,7 +311,6 @@ const fr: Translation = {
   LEAVE: 'Leave', // TODO translate
   SCHEDULER: 'Scheduler', // TODO translate
   SCHEDULER_HELP_1: 'Add custom scheduled commands to automate EMS-ESP', // TODO translate
-  SCHEDULER_HELP_2: 'Note: The NTP service needs to be active if using the calendar', // TODO translate
   SCHEDULE: 'Schedule', // TODO translate
   TIME: 'Time', // TODO translate
   TIMER: 'Timer', // TODO translate
diff --git a/interface/src/i18n/nl/index.ts b/interface/src/i18n/nl/index.ts
index 939d0b081..c23d8eecf 100644
--- a/interface/src/i18n/nl/index.ts
+++ b/interface/src/i18n/nl/index.ts
@@ -311,7 +311,6 @@ const nl: Translation = {
   LEAVE: 'Leave', // TODO translate
   SCHEDULER: 'Scheduler', // TODO translate
   SCHEDULER_HELP_1: 'Add custom scheduled commands to automate EMS-ESP', // TODO translate
-  SCHEDULER_HELP_2: 'Note: The NTP service needs to be active if using the calendar', // TODO translate
   SCHEDULE: 'Schedule', // TODO translate
   TIME: 'Time', // TODO translate
   TIMER: 'Timer', // TODO translate
diff --git a/interface/src/i18n/no/index.ts b/interface/src/i18n/no/index.ts
index e0d157a0d..bef50fca9 100644
--- a/interface/src/i18n/no/index.ts
+++ b/interface/src/i18n/no/index.ts
@@ -311,7 +311,6 @@ const no: Translation = {
   LEAVE: 'Leave', // TODO translate
   SCHEDULER: 'Scheduler', // TODO translate
   SCHEDULER_HELP_1: 'Add custom scheduled commands to automate EMS-ESP', // TODO translate
-  SCHEDULER_HELP_2: 'Note: The NTP service needs to be active if using the calendar', // TODO translate
   SCHEDULE: 'Schedule', // TODO translate
   TIME: 'Time', // TODO translate
   TIMER: 'Timer', // TODO translate
diff --git a/interface/src/i18n/pl/index.ts b/interface/src/i18n/pl/index.ts
index 6c2bb2c1f..325eac75f 100644
--- a/interface/src/i18n/pl/index.ts
+++ b/interface/src/i18n/pl/index.ts
@@ -311,7 +311,6 @@ const pl: BaseTranslation = {
   LEAVE: 'Leave', // TODO translate
   SCHEDULER: 'Scheduler', // TODO translate
   SCHEDULER_HELP_1: 'Add custom scheduled commands to automate EMS-ESP', // TODO translate
-  SCHEDULER_HELP_2: 'Note: The NTP service needs to be active if using the calendar', // TODO translate
   SCHEDULE: 'Schedule', // TODO translate  SCHEDULE: 'Schedule', // TODO translate
   TIME: 'Time', // TODO translate
   TIMER: 'Timer', // TODO translate
diff --git a/interface/src/i18n/sv/index.ts b/interface/src/i18n/sv/index.ts
index 5036b447c..3eca024b2 100644
--- a/interface/src/i18n/sv/index.ts
+++ b/interface/src/i18n/sv/index.ts
@@ -311,7 +311,6 @@ const sv: Translation = {
   LEAVE: 'Leave', // TODO translate
   SCHEDULER: 'Scheduler', // TODO translate
   SCHEDULER_HELP_1: 'Add custom scheduled commands to automate EMS-ESP', // TODO translate
-  SCHEDULER_HELP_2: 'Note: The NTP service needs to be active if using the calendar', // TODO translate
   SCHEDULE: 'Schedule', // TODO translate
   TIME: 'Time', // TODO translate
   TIMER: 'Timer', // TODO translate
diff --git a/interface/src/project/SettingsScheduler.tsx b/interface/src/project/SettingsScheduler.tsx
index f57ef6e18..fd12e321c 100644
--- a/interface/src/project/SettingsScheduler.tsx
+++ b/interface/src/project/SettingsScheduler.tsx
@@ -33,7 +33,6 @@ import AddIcon from '@mui/icons-material/Add';
 
 import {
   ValidatedTextField,
-  MessageBox,
   ButtonRow,
   FormLoader,
   BlockFormControlLabel,
@@ -243,7 +242,7 @@ const SettingsScheduler: FC = () => {
             .filter((si) => !si.deleted)
             .map((condensed_si) => {
               return {
-                id: condensed_si.id, // will be ignored
+                id: condensed_si.id,
                 active: condensed_si.active,
                 flags: condensed_si.flags,
                 time: condensed_si.time,
@@ -335,7 +334,10 @@ const SettingsScheduler: FC = () => {
 
   const updateScheduleItem = () => {
     if (scheduleItem) {
-      const new_schedule = [...schedule.filter((si) => si.id !== scheduleItem.id), scheduleItem];
+      const new_schedule = [...schedule.filter((si) => si.id !== scheduleItem.id), scheduleItem].sort((a, b) =>
+        a.time.localeCompare(b.time)
+      );
+
       setSchedule(new_schedule);
       setScheduleItem(undefined);
     }
@@ -564,7 +566,6 @@ const SettingsScheduler: FC = () => {
       <Box mb={2} color="warning.main">
         <Typography variant="body2">{LL.SCHEDULER_HELP_1()}</Typography>
       </Box>
-      <MessageBox level="info" message={LL.SCHEDULER_HELP_2()} mb={2} mt={1} />
       {renderSchedule()}
       {renderEditSchedule()}
       <Box display="flex" flexWrap="wrap">