diff --git a/controllers/calendar/CalendarController.php b/controllers/calendar/CalendarController.php
index eb1c1c9..d9f2d57 100644
--- a/controllers/calendar/CalendarController.php
+++ b/controllers/calendar/CalendarController.php
@@ -35,7 +35,7 @@ public function actionFind(){
         if(isset($_GET['start_date']) || isset($_GET['end_date'])){
             if(isset($_GET['start_date']) && !isset($_GET['end_date'])) {
                 $start = $_GET['start_date'];
-                $query->andFilterWhere(['>=', 'start_datetime', $start]);
+                $query->andFilterWhere(['>=', 'start_datetime', $start])->orFilterWhere(['>=', 'end_datetime', $start]);
             }
             elseif (!isset($_GET['start_date']) && isset($_GET['end_date'])){
                 $end = $_GET['end_date'];
@@ -113,7 +113,7 @@ public function actionFindByContainer($containerId)
         if(isset($_GET['start_date']) || isset($_GET['end_date'])){
             if(isset($_GET['start_date']) && !isset($_GET['end_date'])) {
                 $start = $_GET['start_date'];
-                $query->andFilterWhere(['>=', 'start_datetime', $start]);
+                $query->andFilterWhere(['>=', 'start_datetime', $start])->orFilterWhere(['>=', 'end_datetime', $start]);
             }
             elseif (!isset($_GET['start_date']) && isset($_GET['end_date'])){
                 $end = $_GET['end_date'];