diff --git a/src/Filter/Range.php b/src/Filter/Range.php
index 77e4e49029ff9c9ed27b1eb4ff06056f7fe2dee2..af23dd96953a2d5d99a22dbeb0d1d7a3f81ce9b3 100644
--- a/src/Filter/Range.php
+++ b/src/Filter/Range.php
@@ -5,16 +5,29 @@ declare(strict_types=1);
 namespace IQDEV\Packages\DoctrineHttpFilter\Filter;
 
 use Doctrine\ORM\QueryBuilder;
+use IQDEV\Packages\DoctrineHttpFilter\Exception\FilterParameterValueIsNullException;
 use IQDEV\Packages\DoctrineHttpFilter\HttpFilter;
 
 final class Range extends HttpFilter
 {
+    /** @throws FilterParameterValueIsNullException */
     public function addToQuery(QueryBuilder $queryBuilder): QueryBuilder
     {
-        $queryBuilder->where(
-            $this->getColumn() . '>= ' . $this->getHttpValue()['min'] . ' AND ' .
-            $this->getColumn() . ' <= ' . $this->getHttpValue()['max'],
-        );
+        if (! isset($this->getHttpValue()['min']) && ! isset($this->getHttpValue()['max'])) {
+            throw new FilterParameterValueIsNullException($this->field);
+        }
+
+        if (isset($this->getHttpValue()['min'])) {
+            $queryBuilder->where(
+                $this->getColumn() . '>= ' . $this->getHttpValue()['min']
+            );
+        }
+
+        if (isset($this->getHttpValue()['max'])) {
+            $queryBuilder->andWhere(
+                $this->getColumn() . ' <= ' . $this->getHttpValue()['max']
+            );
+        }
 
         return $queryBuilder;
     }