diff --git a/src/Handlers/BillinkPaymentHandler.php b/src/Handlers/BillinkPaymentHandler.php
index 74eb3380..8c4d6d01 100644
--- a/src/Handlers/BillinkPaymentHandler.php
+++ b/src/Handlers/BillinkPaymentHandler.php
@@ -31,9 +31,10 @@ public function getMethodPayload(
         SalesChannelContext $salesChannelContext,
         string $paymentCode
     ): array {
+        $billingAddress = $this->asyncPaymentService->getBillingAddress($order);
         return array_merge_recursive(
             $this->getVatNumber($dataBag),
-            $this->getCoc($dataBag),
+            $this->getCoc($billingAddress),
             $this->getBillingData($order, $dataBag),
             $this->getShippingData($order, $dataBag),
             $this->getArticles($order, $paymentCode)
@@ -161,21 +162,20 @@ protected function getVatNumber(RequestDataBag $dataBag): array
     }
 
     /**
-     * Get chamber of commerce number
+     * Get chamber of commerce number from the billing address VAT ID.
      *
-     * @param RequestDataBag $dataBag
+     * @param OrderAddressEntity $billingAddress
      *
      * @return array<mixed>
      */
-    protected function getCoc(RequestDataBag $dataBag): array
+    protected function getCoc(OrderAddressEntity $billingAddress): array
     {
-        if ($dataBag->has('buckaroo_ChamberOfCommerce') &&
-            is_string($dataBag->get('buckaroo_ChamberOfCommerce'))
-        ) {
+        $vatId = $billingAddress->getVatId();
+        if (!empty($vatId)) {
             return [
                 'billing' => [
                     'recipient' => [
-                        'chamberOfCommerce' => $dataBag->get('buckaroo_ChamberOfCommerce')
+                        'chamberOfCommerce' => $vatId
                     ]
                 ]
             ];
diff --git a/src/Resources/views/storefront/buckaroo/payment-methods/billink.html.twig b/src/Resources/views/storefront/buckaroo/payment-methods/billink.html.twig
index a40ed1c6..ff7d2087 100644
--- a/src/Resources/views/storefront/buckaroo/payment-methods/billink.html.twig
+++ b/src/Resources/views/storefront/buckaroo/payment-methods/billink.html.twig
@@ -31,41 +31,7 @@
                     {{ "buckaroo.checkout.buckarooMobilePhoneError"|trans|sw_sanitize }}
                 </label>
             </div>
-            {% if page.extensions.buckaroo.BillinkBusiness == 'B2B' %}
-                <div class="form-group">
-                    <label class="form-label" for="buckarooChamberOfCommerce">
-                        {{ "buckaroo.checkout.ChamberOfCommerce"|trans|sw_sanitize }}{{ "general.required"|trans|sw_sanitize }}
-                    </label>
-                    <input type="text"
-                           class="form-control{% if formViolations.getViolations('/title') %} is-invalid{% endif %}"
-                           form="confirmOrderForm"
-                           id="buckarooChamberOfCommerce"
-                           name="buckaroo_ChamberOfCommerce"
-                           placeholder="{{ "buckaroo.checkout.ChamberOfCommercePlaceholder"|trans|striptags }}{{ "general.required"|trans|striptags }}"
-                           value=""
-                           required="required"
-                           minlength="3">
-                    <label class="form-label" style="display:none; color:red" for="buckarooChamberOfCommerce" id="buckarooChamberOfCommerceError">
-                        {{ "buckaroo.checkout.buckarooMobilePhoneError"|trans|sw_sanitize }}
-                    </label>
-                </div>
-                <div class="form-group">
-                    <label class="form-label" for="buckarooVATNumber">
-                        {{ "buckaroo.checkout.VATNumber"|trans|sw_sanitize }}
-                    </label>
-                    <input type="text"
-                           class="form-control{% if formViolations.getViolations('/title') %} is-invalid{% endif %}"
-                           form="confirmOrderForm"
-                           id="buckarooVATNumber"
-                           name="buckaroo_VATNumber"
-                           placeholder="{{ "buckaroo.checkout.VATNumberPlaceholder"|trans|striptags }}"
-                           value=""
-                           minlength="3">
-                    <label class="form-label" style="display:none; color:red" for="buckarooVATNumber" id="buckarooVATNumberError">
-                        {{ "buckaroo.checkout.buckarooMobilePhoneError"|trans|sw_sanitize }}
-                    </label>
-                </div>
-            {% else %}
+            {% if page.extensions.buckaroo.BillinkBusiness != 'B2B' %}
                 <div class="form-group">
                     <label class="label" for="buckaroo_billink_DoB">{{ "buckaroo.checkout.buckarooAfterpayDoBTitle"|trans }}:</label>
                     <span><sup>{{ "buckaroo.checkout.buckarooAfterpayDoBTitleSup"|trans }}</sup></span>