diff --git a/src/Command/SetWarrantyBranchCodeCommand.php b/src/Command/SetWarrantyBranchCodeCommand.php
index c6478e49..51c76ced 100644
--- a/src/Command/SetWarrantyBranchCodeCommand.php
+++ b/src/Command/SetWarrantyBranchCodeCommand.php
@@ -48,9 +48,9 @@ class SetWarrantyBranchCodeCommand extends Command
             $dealer_name = strtoupper($warranty->getDealerName());
             // error_log('warranty dealer name ' . $dealer_name);
 
-            // find dealer using name
-            $dealer_results = $em->getRepository(Dealer::class)->findBy(['name' => $dealer_name]);
-            foreach ($dealer_results as $dealer)
+            // find dealer using name with findOneBy
+            $dealer = $em->getRepository(Dealer::class)->findOneBy(['name' => $dealer_name]);
+            if ($dealer != null)
             {
                 error_log('Setting branch code for warranty with dealer name ' . $dealer->getName());
                 // get branch code
@@ -58,14 +58,10 @@ class SetWarrantyBranchCodeCommand extends Command
 
                 // set warranty branch code
                 $warranty->setDealerBranchCode($branch_code);
-
-                $em->flush();
             }
-
-            $em->detach($row[0]);
         }
 
-        $em->clear();
+        $em->flush();
 
         return 0;
     }