diff --git a/src/Controller/WarrantyController.php b/src/Controller/WarrantyController.php
index c3e6f284..5e572229 100644
--- a/src/Controller/WarrantyController.php
+++ b/src/Controller/WarrantyController.php
@@ -42,10 +42,19 @@ class WarrantyController extends Controller
                 ->getRepository(Warranty::class)
                 ->createQueryBuilder('w');
 
-        $query = $qb->where('w.serial = :serial')
-                    ->andWhere('w.plate_number = :platenum')
-                    ->setParameter('serial', $serial)
-                    ->setParameter('platenum', $plate_num);
+        $query = $qb;
+        if (!empty($serial))
+        {
+            $qb->where('w.serial = :serial')
+                ->setParameter('serial', $serial);
+        }
+
+        if (!empty($plate_num))
+        {
+            $qb->andWhere('w.plate_number = :plate_num')
+               ->setParameter('plate_num', $plate_num);
+        }
+
         $results = $query->getQuery()->getResult();
 
         $res = [];