diff --git a/src/Controller/BatteryManufacturerController.php b/src/Controller/BatteryManufacturerController.php
index ad93d3df..c717a678 100644
--- a/src/Controller/BatteryManufacturerController.php
+++ b/src/Controller/BatteryManufacturerController.php
@@ -270,7 +270,7 @@ class BatteryManufacturerController extends Controller
 
         // get row data
         $em = $this->getDoctrine()->getManager();
-        $all_batts = $em->getRepository(Battery::class)->findAll();
+        $all_batts = $em->getRepository(Battery::class)->findBy(['flag_active' => true]);
 
         foreach ($all_batts as $battery)
         {
diff --git a/src/Controller/CAPI/RiderAppController.php b/src/Controller/CAPI/RiderAppController.php
index 1a293058..6a6d3d91 100644
--- a/src/Controller/CAPI/RiderAppController.php
+++ b/src/Controller/CAPI/RiderAppController.php
@@ -1043,7 +1043,7 @@ class RiderAppController extends APIController
         if ($rider == null)
             return new APIResponse(false, 'No rider found.');
 
-        $batts = $em->getRepository(Battery::class)->findAll();
+        $batts = $em->getRepository(Battery::class)->findBy(['flag_active' => true]);
         $models = $em->getRepository(BatteryModel::class)->findAll();
         $sizes = $em->getRepository(BatterySize::class)->findAll();
 
diff --git a/src/Controller/VehicleController.php b/src/Controller/VehicleController.php
index 7c388062..a56dc1b0 100644
--- a/src/Controller/VehicleController.php
+++ b/src/Controller/VehicleController.php
@@ -485,7 +485,7 @@ class VehicleController extends Controller
         // get row data
         $em = $this->getDoctrine()->getManager();
         $vobj = $em->getRepository(Vehicle::class)->find($req->request->get('vehicle_id'));
-        $all_batts = $em->getRepository(Battery::class)->findAll();
+        $all_batts = $em->getRepository(Battery::class)->findBy('flag_active' => true);
 
         if (empty($vobj))
             throw $this->createNotFoundException('The item does not exist');