diff --git a/module/pivot/model.php b/module/pivot/model.php
index 416d191597..1b22a4288a 100644
--- a/module/pivot/model.php
+++ b/module/pivot/model.php
@@ -139,7 +139,7 @@ class pivotModel extends model
      */
     public function processDateVar($var, $type = 'date')
     {
-        if(empty($var)) return $var;
+        if(empty($var)) return NULL;
 
         $format = $type == 'datetime' ? 'Y-m-d H:i:s' : 'Y-m-d';
         switch($var)
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index 4c0e971681..66c0421b7b 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -9141,7 +9141,14 @@ class upgradeModel extends model
             $sql = $data->sql;
             if(!empty($filters))
             {
-                foreach($filters as $filter) $sql = str_replace('$' . $filter->field, "'{$filter->default}'", $sql);
+                foreach($filters as $filter)
+                {
+                    $filterDefault = isset($filter->default) ?  $filter->default : '';
+                    if($filter->type == 'date') $filterDefault = $this->pivot->processDateVar($filterDefault);
+                    $filterDefault = $filterDefault === NULL ? "NULL" : "'{$filterDefault}'";
+
+                    $sql = str_replace('$' . $filter->field, $filterDefault, $sql);
+                }
             }
             $fieldSettings = $this->getFieldSettings($sql);