diff --git a/vendor/magento/module-company/Model/CompanyFieldPool.php b/vendor/magento/module-company/Model/CompanyFieldPool.php
new file mode 100644
index 000000000000..114b1f48de30
--- /dev/null
+++ b/vendor/magento/module-company/Model/CompanyFieldPool.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * ADOBE CONFIDENTIAL
+ *
+ * Copyright 2026 Adobe
+ * All Rights Reserved.
+ *
+ * NOTICE: All information contained herein is, and remains
+ * the property of Adobe and its suppliers, if any. The intellectual
+ * and technical concepts contained herein are proprietary to Adobe
+ * and its suppliers and are protected by all applicable intellectual
+ * property laws, including trade secret and copyright laws.
+ * Dissemination of this information or reproduction of this material
+ * is strictly forbidden unless prior written permission is obtained
+ * from Adobe.
+ */
+declare(strict_types=1);
+
+namespace Magento\Company\Model;
+
+/**
+ * Holds an ordered list of field names declared via di.xml.
+ */
+class CompanyFieldPool
+{
+    /**
+     * @param string[] $fields
+     */
+    public function __construct(
+        private readonly array $fields = []
+    ) {
+    }
+
+    /**
+     * Get the fields for the company profile.
+     *
+     * @return string[]
+     */
+    public function getFields(): array
+    {
+        return array_values($this->fields);
+    }
+}
diff --git a/vendor/magento/module-company/Model/CompanyProfile.php b/vendor/magento/module-company/Model/CompanyProfile.php
index 8b02318a6f61..77cc55506c35 100644
--- a/vendor/magento/module-company/Model/CompanyProfile.php
+++ b/vendor/magento/module-company/Model/CompanyProfile.php
@@ -42,12 +42,22 @@ class CompanyProfile
      * @param CompanyContext $companyContext
      * @param DataObjectHelper $objectHelper
      * @param UserContextInterface $userContext
+     * @param CompanyFieldPool|null $companyProfileFieldPool
+     * @param CompanyFieldPool|null $companyAddressFieldPool
      */
     public function __construct(
         private readonly CompanyContext $companyContext,
         private readonly DataObjectHelper $objectHelper,
         private readonly UserContextInterface $userContext,
+        ?CompanyFieldPool $companyProfileFieldPool = null,
+        ?CompanyFieldPool $companyAddressFieldPool = null,
     ) {
+        if ($companyProfileFieldPool !== null) {
+            $this->companyProfileFields = $companyProfileFieldPool->getFields();
+        }
+        if ($companyAddressFieldPool !== null) {
+            $this->companyAddressFields = $companyAddressFieldPool->getFields();
+        }
     }
 
     /**
@@ -79,16 +89,13 @@ public function filterDataBasedOnCompanyAclPermissions(array $data): array
             // company ACL permissions only apply in the storefront customer context
             return $data;
         }
-        if (!$this->companyContext->isResourceAllowed('Magento_Company::edit_account')) {
-            foreach ($this->companyProfileFields as $field) {
-                unset($data[$field]);
-            }
+        $allowedFields = [];
+        if ($this->companyContext->isResourceAllowed('Magento_Company::edit_account')) {
+            $allowedFields = array_merge($allowedFields, $this->companyProfileFields);
         }
-        if (!$this->companyContext->isResourceAllowed('Magento_Company::edit_address')) {
-            foreach ($this->companyAddressFields as $field) {
-                unset($data[$field]);
-            }
+        if ($this->companyContext->isResourceAllowed('Magento_Company::edit_address')) {
+            $allowedFields = array_merge($allowedFields, $this->companyAddressFields);
         }
-        return $data;
+        return array_intersect_key($data, array_flip($allowedFields));
     }
 }
diff --git a/vendor/magento/module-company/etc/di.xml b/vendor/magento/module-company/etc/di.xml
index 85704cec9e1b..cf9fe0d45f54 100755
--- a/vendor/magento/module-company/etc/di.xml
+++ b/vendor/magento/module-company/etc/di.xml
@@ -307,4 +307,34 @@
     <type name="Magento\Eav\Model\Validator\Attribute\Data">
         <plugin name="hide_custom_tax_vat_validation" type="Magento\Company\Plugin\Eav\Validator\Attribute\TaxVatValidatorPlugin"/>
     </type>
+    <virtualType name="companyProfileFieldPool" type="Magento\Company\Model\CompanyFieldPool">
+        <arguments>
+            <argument name="fields" xsi:type="array">
+                <item name="company_name" xsi:type="string">company_name</item>
+                <item name="legal_name" xsi:type="string">legal_name</item>
+                <item name="company_email" xsi:type="string">company_email</item>
+                <item name="vat_tax_id" xsi:type="string">vat_tax_id</item>
+                <item name="reseller_id" xsi:type="string">reseller_id</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="companyAddressFieldPool" type="Magento\Company\Model\CompanyFieldPool">
+        <arguments>
+            <argument name="fields" xsi:type="array">
+                <item name="street" xsi:type="string">street</item>
+                <item name="city" xsi:type="string">city</item>
+                <item name="country_id" xsi:type="string">country_id</item>
+                <item name="region_id" xsi:type="string">region_id</item>
+                <item name="region" xsi:type="string">region</item>
+                <item name="postcode" xsi:type="string">postcode</item>
+                <item name="telephone" xsi:type="string">telephone</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <type name="Magento\Company\Model\CompanyProfile">
+        <arguments>
+            <argument name="companyProfileFieldPool" xsi:type="object">companyProfileFieldPool</argument>
+            <argument name="companyAddressFieldPool" xsi:type="object">companyAddressFieldPool</argument>
+        </arguments>
+    </type>
 </config>