diff --git a/src/Bundle/ResourceBundle/Routing/ParameterResolver.php b/src/Bundle/ResourceBundle/Routing/ParameterResolver.php
index b9bd570..e5b2471 100644
--- a/src/Bundle/ResourceBundle/Routing/ParameterResolver.php
+++ b/src/Bundle/ResourceBundle/Routing/ParameterResolver.php
@@ -84,7 +84,7 @@ public function resolveCriteria($mandatory = false)
         foreach ($value as $identifier) {
             $value = $request->get($identifier);
 
-            if (empty($value)) {
+            if ($value === null) {
                 throw new RuntimeException(sprintf(
                     'The criteria "%s" could not be found for the route "%s".',
                     $identifier,
diff --git a/src/Component/Resource/Repository/Doctrine/MongoDB/Repository.php b/src/Component/Resource/Repository/Doctrine/MongoDB/Repository.php
index 1989c8a..e72a2c4 100644
--- a/src/Component/Resource/Repository/Doctrine/MongoDB/Repository.php
+++ b/src/Component/Resource/Repository/Doctrine/MongoDB/Repository.php
@@ -163,7 +163,7 @@ private function applyCriteria(Builder $queryBuilder, array $criteria = null)
                 $queryBuilder->field($this->getProperty($property, $queryBuilder))->equals(null);
             } elseif (is_array($value)) {
                 $queryBuilder->field($this->getProperty($property, $queryBuilder))->in($value);
-            } elseif (!empty($value)) {
+            } elseif ($value !== null) {
                 $queryBuilder->field($this->getProperty($property, $queryBuilder))->equals($value);
             }
         }
diff --git a/src/Component/Resource/Repository/Doctrine/ORM/Repository.php b/src/Component/Resource/Repository/Doctrine/ORM/Repository.php
index 7515d96..20a7f6a 100644
--- a/src/Component/Resource/Repository/Doctrine/ORM/Repository.php
+++ b/src/Component/Resource/Repository/Doctrine/ORM/Repository.php
@@ -175,7 +175,7 @@ private function applyCriteria(QueryBuilder $queryBuilder, array $criteria = nul
                         $this->createPlaceholder($parameter = $this->createParameter($property))
                     ))
                     ->setParameter($parameter, $value);
-            } elseif (!empty($value)) {
+            } elseif ($value !== null) {
                 $queryBuilder
                     ->andWhere($queryBuilder->expr()->eq(
                         $property = $this->getProperty($property, $queryBuilder),