diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/DateFilterPopupComponent.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/DateFilterPopupComponent.java
index cc9209a74f37..a7d211733655 100644
--- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/DateFilterPopupComponent.java
+++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/DateFilterPopupComponent.java
@@ -103,7 +103,10 @@ public class DateFilterPopupComponent extends FilterPopupComponent<VcsLogDateFil
       db.setPreferredFocusComponent(dateComponent.getPanel());
       db.setTitle(VcsLogBundle.message("vcs.log.date.filter.select.period.dialog.title"));
       if (DialogWrapper.OK_EXIT_CODE == db.show()) {
-        myFilterModel.setFilter(VcsLogFilterObject.fromDates(dateComponent.getAfter(), dateComponent.getBefore()));
+        VcsLogDateFilter dateFilter = VcsLogFilterObject.fromDates(dateComponent.getAfter(), dateComponent.getBefore());
+        if (dateFilter.getAfter() != null || dateFilter.getBefore() != null) {
+          myFilterModel.setFilter(dateFilter);
+        }
       }
     }
   }