diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2ccd9d47dea168638da842abb48fb60e2cc29b6e..d531d4bdfb01b3c92ed70b8f7cc077f0a7d9d707 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Version 1.93 (not yet released)
 
+* Fixed issue with download spreadsheet export and selection of all records.
+
 # Version 1.92
 
 * Fixed issue #136: getSort also NULL as return
diff --git a/Civi/DataProcessor/DataFlow/SqlDataFlow/SimpleWhereClause.php b/Civi/DataProcessor/DataFlow/SqlDataFlow/SimpleWhereClause.php
index c87d37a672b17084ec85151a38b0d14cd08b044b..98439b9c3a1bb5f9d6a81e65015b20299dfcbef6 100644
--- a/Civi/DataProcessor/DataFlow/SqlDataFlow/SimpleWhereClause.php
+++ b/Civi/DataProcessor/DataFlow/SqlDataFlow/SimpleWhereClause.php
@@ -124,12 +124,12 @@ class SimpleWhereClause extends AbstractWhereClause implements WhereClauseInterf
       case '!=':
         return "($fieldStatement $this->operator $this->value OR `$this->table_alias`.`$this->field` IS NULL)";
       case 'IS NULL':
-        if ($this->valueType == 'Timestamp') {
+        if ($this->valueType == 'Timestamp' || $this->valueType == 'Date') {
           return "$fieldStatement $this->operator $this->value";
         }
         return "(`$this->table_alias`.`$this->field` $this->operator OR `$this->table_alias`.`$this->field` = '')";
       case 'IS NOT NULL':
-        if ($this->valueType == 'Timestamp') {
+        if ($this->valueType == 'Timestamp' || $this->valueType == 'Date') {
           return "$fieldStatement $this->operator $this->value";
         }
         return "(`$this->table_alias`.`$this->field` $this->operator AND `$this->table_alias`.`$this->field` != '')";