diff --git a/application/Espo/Core/Select/Where/Item.php b/application/Espo/Core/Select/Where/Item.php
index 951c63f6bb..97aa91ba9f 100644
--- a/application/Espo/Core/Select/Where/Item.php
+++ b/application/Espo/Core/Select/Where/Item.php
@@ -88,7 +88,7 @@ class Item
                 ::create()
                 ->withTimeZone($params['timeZone'] ?? null);
         }
-        else if ($params['timeZone'] ?? null) {
+        else if ($params['date'] ?? null) {
             $obj->data = Data\Date
                 ::create()
                 ->withTimeZone($params['timeZone'] ?? null);
@@ -96,6 +96,7 @@ class Item
 
         unset($params['field']);
         unset($params['dateTime']);
+        unset($params['date']);
         unset($params['timeZone']);
 
         foreach (array_keys($params) as $key) {
diff --git a/client/src/search-manager.js b/client/src/search-manager.js
index ba7130b36d..eefa9b7ba5 100644
--- a/client/src/search-manager.js
+++ b/client/src/search-manager.js
@@ -289,6 +289,10 @@ class SearchManager {
                 data.dateTime = true;
             }
 
+            if (defs.date) {
+                data.date = true;
+            }
+
             if (timeZone) {
                 data.timeZone = timeZone;
             }