From 429b340e4eca9c14b63cc467a989ea242f6f5e8f Mon Sep 17 00:00:00 2001
From: Gregor Isser <16879037+gexxx05@users.noreply.github.com>
Date: Tue, 16 Sep 2025 14:26:29 +0200
Subject: [PATCH] Fix incorrect free_shipping flag for virtual products

---
 .../OfflineShipping/Model/Quote/Address/FreeShipping.php        | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/code/Magento/OfflineShipping/Model/Quote/Address/FreeShipping.php b/app/code/Magento/OfflineShipping/Model/Quote/Address/FreeShipping.php
index 42ec4b63a5c48..9767c0787dc19 100644
--- a/app/code/Magento/OfflineShipping/Model/Quote/Address/FreeShipping.php
+++ b/app/code/Magento/OfflineShipping/Model/Quote/Address/FreeShipping.php
@@ -43,6 +43,8 @@ public function isFreeShipping(\Magento\Quote\Model\Quote $quote, $items)
         $this->calculator->initFromQuote($quote);
         $shippingAddress = $quote->getShippingAddress();
         $shippingAddress->setFreeShipping(0);
+        $billingAddress = $quote->getBillingAddress();
+        $billingAddress->setFreeShipping(0);
         /** @var \Magento\Quote\Api\Data\CartItemInterface $item */
         foreach ($items as $item) {
             if ($item->getNoDiscount()) {