diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java
index 52d3fa9e7..87a9ed77a 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java
@@ -290,10 +290,14 @@ public class CompanyPlanningController implements Composer {
         if (listFilters.isEmpty() && startDate == null && finishDate == null) {
             IPredicate predicate = model.getDefaultPredicate(includeOrderElements);
             //show filter dates calculated by default on screen
-            filterStartDate.setValue(model.getFilterStartDate().
-                    toDateMidnight().toDate());
-            filterFinishDate.setValue(model.getFilterFinishDate().
-                    toDateMidnight().toDate());
+            if(model.getFilterStartDate() != null) {
+                filterStartDate.setValue(model.getFilterStartDate().
+                        toDateMidnight().toDate());
+            }
+            if(model.getFilterFinishDate() != null) {
+                filterFinishDate.setValue(model.getFilterFinishDate().
+                        toDateMidnight().toDate());
+            }
             return predicate;
         }
         return new TaskGroupPredicate(listFilters, startDate, finishDate,