diff --git a/src/Controller/MonitoringApiController.php b/src/Controller/MonitoringApiController.php
index c8594f2..9772615 100644
--- a/src/Controller/MonitoringApiController.php
+++ b/src/Controller/MonitoringApiController.php
@@ -82,9 +82,9 @@ class MonitoringApiController extends AbstractController
 
             if ($lightTime >= $lightOnAt && $lightTime <= $lightOffAt) {
                 $lightOn['data'][] = 0;
-                $lightOff['data'][] = null;
+                $lightOff['data'][] = in_array($lightTime, [$lightOnAt, $lightOffAt]) ? 0 : null;
             } else {
-                $lightOn['data'][] = null;
+                $lightOn['data'][] = in_array($lightTime, [$lightOnAt, $lightOffAt]) ? 0 : null;
                 $lightOff['data'][] = 0;
             }
         }
@@ -159,9 +159,9 @@ class MonitoringApiController extends AbstractController
 
             if ($lightTime >= $lightOnAt && $lightTime <= $lightOffAt) {
                 $lightOn['data'][] = 0;
-                $lightOff['data'][] = null;
+                $lightOff['data'][] = in_array($lightTime, [$lightOnAt, $lightOffAt]) ? 0 : null;
             } else {
-                $lightOn['data'][] = null;
+                $lightOn['data'][] = in_array($lightTime, [$lightOnAt, $lightOffAt]) ? 0 : null;
                 $lightOff['data'][] = 0;
             }
         }