diff --git a/PepperDashEssentials/Room/Types/EssentialsTechRoom.cs b/PepperDashEssentials/Room/Types/EssentialsTechRoom.cs
index c90e9414..3dc45c3a 100644
--- a/PepperDashEssentials/Room/Types/EssentialsTechRoom.cs
+++ b/PepperDashEssentials/Room/Types/EssentialsTechRoom.cs
@@ -187,6 +187,11 @@ namespace PepperDash.Essentials
             OnScheduledEventUpdate();
         }
 
+        public List<ScheduledEventConfig> GetScheduledEvents()
+        {
+            return _config.ScheduledEvents ?? new List<ScheduledEventConfig>();
+        }
+
         private void OnScheduledEventUpdate()
         {
             var handler = ScheduledEventsChanged;
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Global/Scheduler.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Global/Scheduler.cs
index 11232896..192f7dd0 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Global/Scheduler.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Global/Scheduler.cs	
@@ -170,7 +170,15 @@ namespace PepperDash.Essentials.Core
 
             var eventTime = DateTime.Parse(config.Time);
 
-            if (DateTime.Now > eventTime) eventTime = eventTime.AddDays(1);
+            if (DateTime.Now > eventTime)
+            {
+                eventTime = eventTime.AddDays(1);
+            }
+
+            while (!config.Days.ToString().ToLower().Contains(eventTime.DayOfWeek.ToString().ToLower()))
+            {
+                eventTime = eventTime.AddDays(1);
+            }
 
             scheduledEvent.DateAndTime.SetAbsoluteEventTime(eventTime);