diff --git a/integration-tests/src/python-integration-test/python/nxcals/integrationtests/pytimber/test_pytimber.py b/integration-tests/src/python-integration-test/python/nxcals/integrationtests/pytimber/test_pytimber.py
index 053ca373cea6a1a5f4c4166cf02e0f5acf1e9d5f..78f8b44c61813ffb40a7ae44475600dbec3f9925 100644
--- a/integration-tests/src/python-integration-test/python/nxcals/integrationtests/pytimber/test_pytimber.py
+++ b/integration-tests/src/python-integration-test/python/nxcals/integrationtests/pytimber/test_pytimber.py
@@ -131,6 +131,13 @@ class TestFill:
                 FILLS_NUMBER - 1,
                 FIRST_FILL,
             ),
+            (
+                START_TIME,
+                END_TIME,
+                None,
+                FILLS_NUMBER - 1,
+                FIRST_FILL,
+            ),
         ],
     )
     def test_get_lhc_fills_by_time(
diff --git a/python/pytimber/pytimber/fills.py b/python/pytimber/pytimber/fills.py
index 1529a08e0517febbb39c9cce9ef45375fea673b0..629632c9c1f953a2d73bb5921b39134443b787c6 100644
--- a/python/pytimber/pytimber/fills.py
+++ b/python/pytimber/pytimber/fills.py
@@ -61,7 +61,7 @@ class FillManager:
     ) -> List[Dict[str, Any]]:
         fills = self._get_fills(from_time, to_time)
         if not beam_modes:
-            return fills
+            return [_to_fill(f) for f in fills]
 
         modes = (
             [mode.strip() for mode in beam_modes.split(",")]