diff --git a/libreplan-business/src/main/java/org/libreplan/business/orders/daos/OrderDAO.java b/libreplan-business/src/main/java/org/libreplan/business/orders/daos/OrderDAO.java
index deb472008..eae72f169 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/orders/daos/OrderDAO.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/orders/daos/OrderDAO.java
@@ -320,11 +320,11 @@ public class OrderDAO extends IntegrationEntityDAO<Order> implements
         String strQuery = "SELECT t.taskSource.schedulingData.orderElement.id "
                 + "FROM TaskElement t "
                 + "WHERE t.parent IS NULL ";
-        if (startDate != null) {
-            strQuery += "AND t.startDate.date >= :startDate ";
-        }
         if (endDate != null) {
-            strQuery += "AND t.endDate.date <= :endDate ";
+            strQuery += "AND t.startDate.date <= :endDate ";
+        }
+        if (startDate != null) {
+            strQuery += "AND t.endDate.date >= :startDate ";
         }
 
         Query query = getSession().createQuery(strQuery);