diff --git a/src/Controller/RAPIController.php b/src/Controller/RAPIController.php
index 9cabfa86..883b8f5a 100644
--- a/src/Controller/RAPIController.php
+++ b/src/Controller/RAPIController.php
@@ -635,10 +635,8 @@ class RAPIController extends Controller
         ];
         $mclient->sendEvent($jo, $payload);
 
-        // TODO: verify if we need to create warranty for battery replacement under warranty
-        // create the warranty if new battery or battery replacement
-        if (($jo->getServiceType () == CMBServiceType::BATTERY_REPLACEMENT_NEW) ||
-            ($jo->getServiceType () == CMBServiceType::BATTERY_REPLACEMENT_WARRANTY))
+        // create the warranty if new battery only
+        if ($jo->getServiceType () == CMBServiceType::BATTERY_REPLACEMENT_NEW)
         {
             $this->createWarranty($jo);
         }
diff --git a/src/Service/JobOrderHandler/CMBJobOrderHandler.php b/src/Service/JobOrderHandler/CMBJobOrderHandler.php
index 3186e6ae..5ac7f4c1 100644
--- a/src/Service/JobOrderHandler/CMBJobOrderHandler.php
+++ b/src/Service/JobOrderHandler/CMBJobOrderHandler.php
@@ -705,10 +705,8 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
             $mclient->sendEvent($obj, $payload);
             $mclient->sendRiderEvent($obj, $payload);
 
-            // TODO: verify if we need to create warranty for battery replacement under warranty
-            // create the warranty if new battery or battery replacement
-            if (($obj->getServiceType () == CMBServiceType::BATTERY_REPLACEMENT_NEW) ||
-                ($obj->getServiceType () == CMBServiceType::BATTERY_REPLACEMENT_WARRANTY))
+            // create the warranty if new battery only
+            if ($obj->getServiceType () == CMBServiceType::BATTERY_REPLACEMENT_NEW) 
             {
                 $this->createWarranty($obj);
             }