diff --git a/ipi-survey-platform/src/pages/Admin/configuration/EditCompanyProfile.jsx b/ipi-survey-platform/src/pages/Admin/configuration/EditCompanyProfile.jsx
index f8674e6..3ac8278 100644
--- a/ipi-survey-platform/src/pages/Admin/configuration/EditCompanyProfile.jsx
+++ b/ipi-survey-platform/src/pages/Admin/configuration/EditCompanyProfile.jsx
@@ -46,7 +46,7 @@ const mapApiEstablishmentToProfile = (apiData) => {
     uniqueLicenseNumber: data.license_number || '',
     ERN: data.ERN || '',
     industryCodeBusiness: data.industry_code || '',
-    industryCodeCurrent: data.isic_code || '',
+    industryCodeCurrent: data.industry_code_production || data.isic_code || '',
     industryCodeMismatchRemarks: data.industry_code_mismatch_remarks || '',
     contactName: data.factory_name || '',
     contactAddress: data.establishment_address || '',