diff --git a/src/Components/Assets/AssetsList.tsx b/src/Components/Assets/AssetsList.tsx
index 2af713ec654..11cc7f02e49 100644
--- a/src/Components/Assets/AssetsList.tsx
+++ b/src/Components/Assets/AssetsList.tsx
@@ -139,7 +139,7 @@ const AssetsList = () => {
     try {
       if (assetData) {
         navigate(
-          `/facility/${assetData.location_object.facility?.id}/assets/${assetId}`
+          `/facility/${assetData.location_object.facility?.id}/assets/${assetId}`,
         );
       }
     } catch (err) {
@@ -152,7 +152,7 @@ const AssetsList = () => {
   };
 
   const authorizedForImportExport = useIsAuthorized(
-    AuthorizeFor(["DistrictAdmin", "StateAdmin"])
+    AuthorizeFor(["DistrictAdmin", "StateAdmin"]),
   );
 
   if (isScannerActive)
@@ -170,9 +170,7 @@ const AssetsList = () => {
           onScan={async (value: string | null) => {
             if (value) {
               const assetId = await getAssetIdFromQR(value);
-              if (assetId) {
-                checkValidAssetId(assetId);
-              }
+              checkValidAssetId(assetId ?? value);
             }
           }}
           onError={(e) =>
@@ -401,7 +399,7 @@ const AssetsList = () => {
               value(
                 "Facility",
                 "facility",
-                qParams.facility && facilityObject?.name
+                qParams.facility && facilityObject?.name,
               ),
               badge("Name/Serial No./QR ID", "search"),
               value("Asset Class", "asset_class", asset_class ?? ""),
@@ -409,17 +407,17 @@ const AssetsList = () => {
               value(
                 "Location",
                 "location",
-                qParams.location && locationObject?.name
+                qParams.location && locationObject?.name,
               ),
               value(
                 "Warranty AMC End Of Validity Before",
                 "warranty_amc_end_of_validity_before",
-                qParams.warranty_amc_end_of_validity_before ?? ""
+                qParams.warranty_amc_end_of_validity_before ?? "",
               ),
               value(
                 "Warranty AMC End Of Validity After",
                 "warranty_amc_end_of_validity_after",
-                qParams.warranty_amc_end_of_validity_after ?? ""
+                qParams.warranty_amc_end_of_validity_after ?? "",
               ),
             ]}
           />
@@ -479,7 +477,7 @@ const AssetsList = () => {
 };
 
 export const warrantyAmcValidityChip = (
-  warranty_amc_end_of_validity: string
+  warranty_amc_end_of_validity: string,
 ) => {
   if (warranty_amc_end_of_validity === "" || !warranty_amc_end_of_validity)
     return;
@@ -487,7 +485,8 @@ export const warrantyAmcValidityChip = (
   const warrantyAmcEndDate = new Date(warranty_amc_end_of_validity);
 
   const days = Math.ceil(
-    Math.abs(Number(warrantyAmcEndDate) - Number(today)) / (1000 * 60 * 60 * 24)
+    Math.abs(Number(warrantyAmcEndDate) - Number(today)) /
+      (1000 * 60 * 60 * 24),
   );
 
   if (warrantyAmcEndDate < today) {