diff --git a/src/Repository/EventRepository.php b/src/Repository/EventRepository.php
index e40e083..18a8d63 100644
--- a/src/Repository/EventRepository.php
+++ b/src/Repository/EventRepository.php
@@ -90,9 +90,14 @@ class EventRepository
 
     private function selectUpcomingAndRecent(Select $select, DateTime $from, int $days)
     {
-        $select->where(function (Select $select) use ($from, $days) {
-            $select->where('start', '<', (clone $from)->add(DateInterval::createFromDateString("$days days"))->format('Y-m-d H:i:s'));
-            $select->orWhere('end', '>', (clone $from)->sub(DateInterval::createFromDateString("$days days"))->format('Y-m-d H:i:s'));
-        });
+        $select
+            ->where(function (Select $select) use ($from, $days) {
+                $select->where('start', '<', (clone $from)->add(DateInterval::createFromDateString("$days days"))->format('Y-m-d H:i:s'));
+                $select->where('end', '>', $from->format('Y-m-d H:i:s'));
+            })
+            ->orWhere(function (Select $select) use ($from, $days) {
+                $select->where('end', '>', (clone $from)->sub(DateInterval::createFromDateString("$days days"))->format('Y-m-d H:i:s'));
+                $select->where('start', '<', $from->format('Y-m-d H:i:s'));
+            });
     }
 }