diff --git a/src/Filters/DateFilter.php b/src/Filters/DateFilter.php
index 8375b11..17a8982 100644
--- a/src/Filters/DateFilter.php
+++ b/src/Filters/DateFilter.php
@@ -42,16 +42,16 @@ protected function setUp(): void
                     return [$message . ' ' . $state['period_value'] . ' ' . $state['period'] . ' ' . $state['direction']];
                 }
 
-                if ($state['value']) {
-                    return [$message . ' ' . Carbon::parse($state['value'])->format(config('tables.date_format', 'Y-m-d'))];
-                }
-                if ($state['from'] || $state['until']) {
+                if ($state['clause'] === self::CLAUSE_BETWEEN) {
                     return [
                         $message . ' ' .
-                            ($state['from'] ? Carbon::parse($state['from'])->format(config('tables.date_format', 'Y-m-d')) : 0) . ' and ' .
-                            ($state['until'] ? Carbon::parse($state['until'])->format(config('tables.date_format', 'Y-m-d')) : "~")
+                        ($state['from'] ? Carbon::parse($state['from'])->format(config('tables.date_format', 'Y-m-d')) : 0) . ' and ' .
+                        ($state['until'] ? Carbon::parse($state['until'])->format(config('tables.date_format', 'Y-m-d')) : "~")
                     ];
                 }
+                if ($state['value']) {
+                    return [$message . ' ' . Carbon::parse($state['value'])->format(config('tables.date_format', 'Y-m-d'))];
+                }
             }
 
             return [];