diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8b4b317e..7cad784e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -21,6 +21,7 @@ set (timew_SRCS AtomicFile.cpp AtomicFile.h
                 IntervalFilterAllInRange.cpp IntervalFilterAllInRange.h
                 IntervalFilterAllWithIds.cpp IntervalFilterAllWithIds.h
                 IntervalFilterAllWithTags.cpp IntervalFilterAllWithTags.h
+                IntervalFilterFirstOf.cpp IntervalFilterFirstOf.h
                 Journal.cpp    Journal.h
                 Range.cpp      Range.h
                 Rules.cpp      Rules.h
diff --git a/src/IntervalFilterFirstOf.cpp b/src/IntervalFilterFirstOf.cpp
new file mode 100644
index 00000000..904073e5
--- /dev/null
+++ b/src/IntervalFilterFirstOf.cpp
@@ -0,0 +1,49 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// Copyright 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+//
+// https://www.opensource.org/licenses/mit-license.php
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#include <IntervalFilterFirstOf.h>
+
+IntervalFilterFirstOf::IntervalFilterFirstOf (IntervalFilter *filter) : _filter (filter)
+{}
+
+bool IntervalFilterFirstOf::accepts (const Interval& interval)
+{
+  if (is_done())
+  {
+    return false;
+  }
+
+  auto accepted = _filter->accepts (interval);
+  set_done (accepted);
+
+  return accepted;
+}
+
+void IntervalFilterFirstOf::reset ()
+{
+  set_done (false);
+  _filter->reset ();
+}
diff --git a/src/IntervalFilterFirstOf.h b/src/IntervalFilterFirstOf.h
new file mode 100644
index 00000000..297f77d0
--- /dev/null
+++ b/src/IntervalFilterFirstOf.h
@@ -0,0 +1,44 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// Copyright 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+//
+// https://www.opensource.org/licenses/mit-license.php
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#ifndef INCLUDED_INTERVALFILTERFIRSTOF
+#define INCLUDED_INTERVALFILTERFIRSTOF
+
+#include <IntervalFilter.h>
+
+class IntervalFilterFirstOf : public IntervalFilter
+{
+public:
+  explicit IntervalFilterFirstOf(IntervalFilter *filter);
+
+  bool accepts (const Interval&) final;
+  void reset ();
+
+private:
+  IntervalFilter* _filter;
+};
+
+#endif //INCLUDED_INTERVALFILTERFIRSTOF