diff --git a/Project-Aurora/Project-Aurora/Profiles/LightingStateManager.cs b/Project-Aurora/Project-Aurora/Profiles/LightingStateManager.cs
index 9c0cd6197..9e1f8efbe 100755
--- a/Project-Aurora/Project-Aurora/Profiles/LightingStateManager.cs
+++ b/Project-Aurora/Project-Aurora/Profiles/LightingStateManager.cs
@@ -471,6 +471,19 @@ private void Update()
             if (profile.IsEnabled)
                 UpdateEvent(profile, newFrame);
 
+            // Overlay layers
+            if (!preview || Global.Configuration.OverlaysInPreview) {
+                foreach (var @event in GetOverlayActiveProfiles())
+                    @event.UpdateOverlayLights(newFrame);
+
+                //Add the Light event that we're previewing to be rendered as an overlay (assuming it's not already active)
+                if (preview && Global.Configuration.OverlaysInPreview && !GetOverlayActiveProfiles().Contains(profile))
+                    profile.UpdateOverlayLights(newFrame);
+
+                UpdateIdleEffects(newFrame);
+            }
+
+
             Global.effengine.PushFrame(newFrame);
 
             StopUnUpdatedEvents();