diff --git a/src/Datagrid/Datagrid.php b/src/Datagrid/Datagrid.php
index <HASH>..<HASH> 100644
--- a/src/Datagrid/Datagrid.php
+++ b/src/Datagrid/Datagrid.php
@@ -137,8 +137,9 @@ class Datagrid implements DatagridInterface
 
         foreach ($this->getFilters() as $name => $filter) {
             $this->values[$name] = isset($this->values[$name]) ? $this->values[$name] : null;
-            if ($filter->isActive()) {
-                $filter->apply($this->query, $data[$filter->getFormName()]);
+            $filterFormName = $filter->getFormName();
+            if (isset($this->values[$filterFormName]['value']) && $this->values[$filterFormName]['value'] !== '') {
+                $filter->apply($this->query, $data[$filterFormName]);
             }
         }
Fix #<I> Only apply filters if it has a value other than empty (#<I>)

* Fix #<I> a more proper way (without breaking filters)