diff --git a/PepperDashEssentials/Room/Types/EssentialsTechRoom.cs b/PepperDashEssentials/Room/Types/EssentialsTechRoom.cs
index f6fe1b39..b9edbb70 100644
--- a/PepperDashEssentials/Room/Types/EssentialsTechRoom.cs
+++ b/PepperDashEssentials/Room/Types/EssentialsTechRoom.cs
@@ -102,7 +102,7 @@ namespace PepperDash.Essentials
         {
             if (!_roomScheduledEventGroup.ScheduledEvents.ContainsKey(scheduledEvent.Name))
             {
-                SchedulerUtilities.CreateEventFromConfig(scheduledEvent, _roomScheduledEventGroup);
+                SchedulerUtilities.CreateEventFromConfig(scheduledEvent, _roomScheduledEventGroup, HandleScheduledEvent);
                 return;
             }
 
@@ -120,9 +120,7 @@ namespace PepperDash.Essentials
 
             _roomScheduledEventGroup.DeleteEvent(roomEvent);
 
-            var tempEvent = SchedulerUtilities.CreateEventFromConfig(scheduledEvent, _roomScheduledEventGroup);
-
-            tempEvent.UserCallBack += HandleScheduledEvent;
+            SchedulerUtilities.CreateEventFromConfig(scheduledEvent, _roomScheduledEventGroup, HandleScheduledEvent);
         }
 
         public void AddOrUpdateScheduledEvent(ScheduledEventConfig scheduledEvent)
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Global/Scheduler.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Global/Scheduler.cs
index 9f27a15c..11232896 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Global/Scheduler.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Global/Scheduler.cs	
@@ -151,12 +151,12 @@ namespace PepperDash.Essentials.Core
             return evnt.Recurrence.RecurrenceDays == days;
         }
 
-        public static ScheduledEvent CreateEventFromConfig(ScheduledEventConfig config, ScheduledEventGroup group)
+        public static void CreateEventFromConfig(ScheduledEventConfig config, ScheduledEventGroup group, ScheduledEvent.UserEventCallBack handler)
         {
             if (group == null)
             {
                 Debug.Console(0, "Unable to create event. Group is null");
-                return null;
+                return;
             }
             var scheduledEvent = new ScheduledEvent(config.Key, group)
             {
@@ -164,14 +164,7 @@ namespace PepperDash.Essentials.Core
                 Persistent = config.Persistent
             };
 
-            if (config.Enable)
-            {
-                scheduledEvent.Resume();
-            }
-            else
-            {
-                scheduledEvent.Pause();
-            }
+            scheduledEvent.UserCallBack += handler;
 
             scheduledEvent.DateAndTime.SetFirstDayOfWeek(ScheduledEventCommon.eFirstDayOfWeek.Sunday);
 
@@ -183,7 +176,14 @@ namespace PepperDash.Essentials.Core
 
             scheduledEvent.Recurrence.Weekly(config.Days);
 
-            return scheduledEvent;
+            if (config.Enable)
+            {
+                scheduledEvent.Enable();
+            }
+            else
+            {
+                scheduledEvent.Disable();
+            }
         }
     }
 }
\ No newline at end of file