diff --git a/src/services/data_services.py b/src/services/data_services.py
index 022e74a..707bd04 100644
--- a/src/services/data_services.py
+++ b/src/services/data_services.py
@@ -36,9 +36,15 @@ def find_flickers(selected_readings, all_readings):
 
 def find_readings_with_lights_on(flicker_entries):
     filtered_readings = list()
+    add_to_list = False
     for time, reading in flicker_entries.items():
         for item in reading:
             val = int(item)
             if (val > 39):
-                filtered_readings.append( (time, reading) )
+                add_to_list = True
+                break
+            else:
+                add_to_list = False
+        if (add_to_list == True):
+            filtered_readings.append( (time, reading) )
     return filtered_readings