diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddInStockProductToTheCartTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddInStockProductToTheCartTest.xml
index f228e49355e8a..e12803e5ec8da 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddInStockProductToTheCartTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddInStockProductToTheCartTest.xml
@@ -48,7 +48,7 @@
             <argument name="value" value="Yes"/>
         </actionGroup>
         <actionGroup ref="AdminFillAdvancedInventoryQtyActionGroup" stepKey="fillProductQty">
-            <argument name="qty" value="5"/>
+            <argument name="qty" value="8"/>
         </actionGroup>
         <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="uncheckMiniQtyCheckBox"/>
         <actionGroup ref="AdminSetMinAllowedQtyForProductActionGroup" stepKey="fillMiniAllowedQty">
@@ -111,17 +111,17 @@
             <argument name="productQty" value="4"/>
         </actionGroup>
         <actionGroup ref="StorefrontAddProductToCartWithQtyActionGroup" stepKey="addAdditionalProductToCart">
-            <argument name="productQty" value="1"/>
+            <argument name="productQty" value="4"/>
         </actionGroup>
         <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="seeSuccessSaveMessage"/>
         <seeElement selector="{{StorefrontMinicartSection.quantity(6)}}" stepKey="seeAddedProductQuantityInCart"/>
         <actionGroup ref="StorefrontClickOnMiniCartActionGroup" stepKey="clickOnMiniCart"/>
-        <executeJS function="return {{SimpleProduct.price}} * 5" stepKey="expectedCartSubtotal"/>
+        <executeJS function="return {{SimpleProduct.price}} * 8" stepKey="expectedCartSubtotal"/>
         <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="seeProductNameInMiniCart">
             <argument name="productName" value="{{SimpleProduct.name}}"/>
             <argument name="productPrice" value="{{SimpleProduct.price}}"/>
             <argument name="cartSubtotal" value="{$expectedCartSubtotal}" />
-            <argument name="qty" value="5"/>
+            <argument name="qty" value="8"/>
         </actionGroup>
         <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="seeProductPriceInMiniCart"/>
         <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="seeCheckOutButtonInMiniCart"/>
diff --git a/app/code/Magento/CatalogInventory/Block/Plugin/ProductView.php b/app/code/Magento/CatalogInventory/Block/Plugin/ProductView.php
index 4875afdbeb14a..4ec714a53ac10 100644
--- a/app/code/Magento/CatalogInventory/Block/Plugin/ProductView.php
+++ b/app/code/Magento/CatalogInventory/Block/Plugin/ProductView.php
@@ -5,49 +5,42 @@
  */
 namespace Magento\CatalogInventory\Block\Plugin;
 
-use Magento\CatalogInventory\Api\StockRegistryInterface;
+use Magento\Catalog\Block\Product\View;
+use Magento\CatalogInventory\Model\Product\QuantityValidator;
 
 class ProductView
 {
     /**
-     * @var StockRegistryInterface
+     * @var QuantityValidator
      */
-    private $stockRegistry;
+    private $productQuantityValidator;
 
     /**
-     * @param StockRegistryInterface $stockRegistry
+     * @param QuantityValidator $productQuantityValidator
      */
     public function __construct(
-        StockRegistryInterface $stockRegistry
+        QuantityValidator $productQuantityValidator
     ) {
-        $this->stockRegistry = $stockRegistry;
+        $this->productQuantityValidator = $productQuantityValidator;
     }
 
     /**
      * Adds quantities validator.
      *
-     * @param \Magento\Catalog\Block\Product\View $block
+     * @param View $block
      * @param array $validators
      * @return array
      */
     public function afterGetQuantityValidators(
-        \Magento\Catalog\Block\Product\View $block,
+        View $block,
         array $validators
     ) {
-        $stockItem = $this->stockRegistry->getStockItem(
-            $block->getProduct()->getId(),
-            $block->getProduct()->getStore()->getWebsiteId()
+        return array_merge(
+            $validators,
+            $this->productQuantityValidator->getData(
+                $block->getProduct()->getId(),
+                $block->getProduct()->getStore()->getWebsiteId()
+            )
         );
-
-        $params = [];
-        if ($stockItem->getMaxSaleQty()) {
-            $params['maxAllowed'] = (float)$stockItem->getMaxSaleQty();
-        }
-        if ($stockItem->getQtyIncrements() > 0) {
-            $params['qtyIncrements'] = (float)$stockItem->getQtyIncrements();
-        }
-        $validators['validate-item-quantity'] = $params;
-
-        return $validators;
     }
 }
diff --git a/app/code/Magento/CatalogInventory/Model/Product/QuantityValidator.php b/app/code/Magento/CatalogInventory/Model/Product/QuantityValidator.php
new file mode 100644
index 0000000000000..6cbef082e00f0
--- /dev/null
+++ b/app/code/Magento/CatalogInventory/Model/Product/QuantityValidator.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogInventory\Model\Product;
+
+use Magento\CatalogInventory\Api\StockRegistryInterface;
+
+class QuantityValidator
+{
+    /**
+     * @param StockRegistryInterface $stockRegistry
+     */
+    public function __construct(
+        private readonly StockRegistryInterface $stockRegistry
+    ) {
+    }
+
+    /**
+     * To get quantity validators
+     *
+     * @param int $productId
+     * @param int|null $websiteId
+     *
+     * @return array
+     */
+    public function getData(int $productId, int|null $websiteId): array
+    {
+        $stockItem = $this->stockRegistry->getStockItem($productId, $websiteId);
+
+        if (!$stockItem) {
+            return [];
+        }
+
+        $params = [];
+        $validators = [];
+        $params['minAllowed'] =  $stockItem->getMinSaleQty();
+        if ($stockItem->getMaxSaleQty()) {
+            $params['maxAllowed'] = $stockItem->getMaxSaleQty();
+        }
+        if ($stockItem->getQtyIncrements() > 0) {
+            $params['qtyIncrements'] = (float) $stockItem->getQtyIncrements();
+        }
+        $validators['validate-item-quantity'] = $params;
+
+        return $validators;
+    }
+}
diff --git a/app/code/Magento/CatalogInventory/Test/Unit/Block/Plugin/ProductViewTest.php b/app/code/Magento/CatalogInventory/Test/Unit/Block/Plugin/ProductViewTest.php
deleted file mode 100644
index 0ab50275e01f1..0000000000000
--- a/app/code/Magento/CatalogInventory/Test/Unit/Block/Plugin/ProductViewTest.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-/**
- * Copyright 2015 Adobe
- * All Rights Reserved.
- */
-declare(strict_types=1);
-
-namespace Magento\CatalogInventory\Test\Unit\Block\Plugin;
-
-use Magento\Catalog\Block\Product\View;
-use Magento\Catalog\Model\Product;
-use Magento\CatalogInventory\Api\Data\StockItemInterface;
-use Magento\CatalogInventory\Api\StockRegistryInterface;
-use Magento\CatalogInventory\Block\Plugin\ProductView;
-use Magento\CatalogInventory\Model\Stock\Item;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Store\Model\Store;
-use PHPUnit\Framework\MockObject\MockObject;
-use PHPUnit\Framework\TestCase;
-
-class ProductViewTest extends TestCase
-{
-    /**
-     * @var ProductView
-     */
-    protected $block;
-
-    /**
-     * @var StockItemInterface|MockObject
-     */
-    protected $stockItem;
-
-    /**
-     * @var StockRegistryInterface|MockObject
-     */
-    protected $stockRegistry;
-
-    protected function setUp(): void
-    {
-        $objectManager = new ObjectManager($this);
-
-        $this->stockItem = $this->getMockBuilder(Item::class)
-            ->disableOriginalConstructor()
-            ->onlyMethods(['getMinSaleQty', 'getMaxSaleQty', 'getQtyIncrements'])
-            ->getMock();
-
-        $this->stockRegistry = $this->getMockBuilder(StockRegistryInterface::class)
-            ->getMock();
-
-        $this->block = $objectManager->getObject(
-            ProductView::class,
-            [
-                'stockRegistry' => $this->stockRegistry
-            ]
-        );
-    }
-
-    public function testAfterGetQuantityValidators()
-    {
-        $result = [
-            'validate-item-quantity' => [
-                'maxAllowed' => 5.0,
-                'qtyIncrements' => 3.0
-            ]
-        ];
-        $validators = [];
-        $productViewBlock = $this->getMockBuilder(View::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $productMock = $this->getMockBuilder(Product::class)
-            ->disableOriginalConstructor()
-            ->addMethods(['_wakeup'])
-            ->onlyMethods(['getId', 'getStore'])
-            ->getMock();
-        $storeMock = $this->getMockBuilder(Store::class)
-            ->disableOriginalConstructor()
-            ->addMethods(['_wakeup'])
-            ->onlyMethods(['getWebsiteId'])
-            ->getMock();
-
-        $productViewBlock->expects($this->any())->method('getProduct')->willReturn($productMock);
-        $productMock->expects($this->once())->method('getId')->willReturn('productId');
-        $productMock->expects($this->once())->method('getStore')->willReturn($storeMock);
-        $storeMock->expects($this->once())->method('getWebsiteId')->willReturn('websiteId');
-        $this->stockRegistry->expects($this->once())
-            ->method('getStockItem')
-            ->with('productId', 'websiteId')
-            ->willReturn($this->stockItem);
-        $this->stockItem->expects($this->any())->method('getMaxSaleQty')->willReturn(5);
-        $this->stockItem->expects($this->any())->method('getQtyIncrements')->willReturn(3);
-
-        $this->assertEquals($result, $this->block->afterGetQuantityValidators($productViewBlock, $validators));
-    }
-}
diff --git a/app/code/Magento/CatalogInventory/Test/Unit/Model/Product/QuantityValidatorTest.php b/app/code/Magento/CatalogInventory/Test/Unit/Model/Product/QuantityValidatorTest.php
new file mode 100644
index 0000000000000..ee9227ae366db
--- /dev/null
+++ b/app/code/Magento/CatalogInventory/Test/Unit/Model/Product/QuantityValidatorTest.php
@@ -0,0 +1,132 @@
+<?php
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogInventory\Test\Unit\Model\Product;
+
+use Magento\CatalogInventory\Api\StockRegistryInterface;
+use Magento\CatalogInventory\Model\Product\QuantityValidator;
+use Magento\CatalogInventory\Api\Data\StockItemInterface;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @covers \Magento\CatalogInventory\Model\Product\QuantityValidator
+ */
+class QuantityValidatorTest extends TestCase
+{
+    private const PRODUCT_ID = 42;
+    private const WEBSITE_ID = 1;
+
+    /**
+     * @var QuantityValidator
+     */
+    private $quantityValidator;
+
+    /**
+     * @var StockRegistryInterface|MockObject
+     */
+    private $stockRegistry;
+
+    protected function setUp(): void
+    {
+        $this->stockRegistry = $this->createMock(StockRegistryInterface::class);
+
+        $this->quantityValidator = new QuantityValidator(
+            $this->stockRegistry
+        );
+    }
+
+    public function testGetDataWithMinMaxAndIncrements(): void
+    {
+        $stockItem = $this->createMock(StockItemInterface::class);
+
+        $stockItem->method('getMinSaleQty')
+            ->willReturn(2.0);
+
+        $stockItem->method('getMaxSaleQty')
+            ->willReturn(10.0);
+
+        $stockItem->method('getQtyIncrements')
+            ->willReturn(2.0);
+
+        $this->stockRegistry->expects($this->once())
+            ->method('getStockItem')
+            ->with(self::PRODUCT_ID, self::WEBSITE_ID)
+            ->willReturn($stockItem);
+
+        $expected = [
+            'validate-item-quantity' => [
+                'minAllowed' => 2.0,
+                'maxAllowed' => 10.0,
+                'qtyIncrements' => 2.0
+            ]
+        ];
+
+        $result = $this->quantityValidator->getData(self::PRODUCT_ID, self::WEBSITE_ID);
+        $this->assertEquals($expected, $result);
+    }
+
+    public function testReturnsEmptyArrayForNonExistentProductOrWebsite(): void
+    {
+        $this->stockRegistry->expects($this->once())
+            ->method('getStockItem')
+            ->with(self::PRODUCT_ID, self::WEBSITE_ID)
+            ->willReturn(null);
+
+        $result = $this->quantityValidator->getData(self::PRODUCT_ID, self::WEBSITE_ID);
+        $this->assertSame([], $result, 'Should return empty array when StockItem is not found');
+    }
+
+    public function testHandlesNullValuesFromStockItem(): void
+    {
+        $stockItem = $this->createMock(StockItemInterface::class);
+        $stockItem->method('getMinSaleQty')
+            ->willReturn(null);
+        $stockItem->method('getMaxSaleQty')
+            ->willReturn(null);
+        $stockItem->method('getQtyIncrements')
+            ->willReturn(null);
+
+        $this->stockRegistry->expects($this->once())
+            ->method('getStockItem')
+            ->with(self::PRODUCT_ID, self::WEBSITE_ID)
+            ->willReturn($stockItem);
+
+        $expected = [
+            'validate-item-quantity' => [
+                'minAllowed'    => null
+            ],
+        ];
+        $result = $this->quantityValidator->getData(self::PRODUCT_ID, self::WEBSITE_ID);
+        $this->assertEquals($expected, $result);
+    }
+
+    public function testHandlesInvalidValuesFromStockItem(): void
+    {
+        $stockItem = $this->createMock(StockItemInterface::class);
+        $stockItem->method('getMinSaleQty')
+            ->willReturn('not-a-number');
+        $stockItem->method('getMaxSaleQty')
+            ->willReturn(-5);
+        $stockItem->method('getQtyIncrements')
+            ->willReturn(false);
+
+        $this->stockRegistry->expects($this->once())
+            ->method('getStockItem')
+            ->with(self::PRODUCT_ID, self::WEBSITE_ID)
+            ->willReturn($stockItem);
+
+        $expected = [
+            'validate-item-quantity' => [
+                'minAllowed'    => 'not-a-number',
+                'maxAllowed'    => -5
+            ],
+        ];
+        $result = $this->quantityValidator->getData(self::PRODUCT_ID, self::WEBSITE_ID);
+        $this->assertEquals($expected, $result);
+    }
+}
diff --git a/app/code/Magento/GroupedProduct/ViewModel/ValidateQuantity.php b/app/code/Magento/GroupedProduct/ViewModel/ValidateQuantity.php
new file mode 100644
index 0000000000000..b8bf9bd6faad8
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/ViewModel/ValidateQuantity.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\GroupedProduct\ViewModel;
+
+use Magento\CatalogInventory\Model\Product\QuantityValidator;
+use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Framework\View\Element\Block\ArgumentInterface;
+
+/**
+ * ViewModel for Grouped Products Block
+ */
+class ValidateQuantity implements ArgumentInterface
+{
+    /**
+     * @param Json $serializer
+     * @param QuantityValidator $productQuantityValidator
+     */
+    public function __construct(
+        private readonly Json $serializer,
+        private readonly QuantityValidator $productQuantityValidator,
+    ) {
+    }
+
+    /**
+     * To get the quantity validators
+     *
+     * @param int $productId
+     * @param int|null $websiteId
+     *
+     * @return string
+     */
+    public function getQuantityValidators(int $productId, int|null $websiteId): string
+    {
+        return $this->serializer->serialize(
+            array_merge(
+                ['validate-grouped-qty' => '#super-product-table'],
+                $this->productQuantityValidator->getData($productId, $websiteId)
+            )
+        );
+    }
+}
diff --git a/app/code/Magento/GroupedProduct/view/frontend/layout/catalog_product_view_type_grouped.xml b/app/code/Magento/GroupedProduct/view/frontend/layout/catalog_product_view_type_grouped.xml
index a774f384d947a..4a1f813484b3c 100644
--- a/app/code/Magento/GroupedProduct/view/frontend/layout/catalog_product_view_type_grouped.xml
+++ b/app/code/Magento/GroupedProduct/view/frontend/layout/catalog_product_view_type_grouped.xml
@@ -1,15 +1,19 @@
 <?xml version="1.0"?>
 <!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
+ /**
+  * Copyright 2015 Adobe
+  * All Rights Reserved.
+  */
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <attribute name="class" value="page-product-grouped"/>
         <referenceContainer name="product.info.form.content">
-            <block class="Magento\GroupedProduct\Block\Product\View\Type\Grouped" name="product.info.grouped" before="product.info.addtocart" template="Magento_GroupedProduct::product/view/type/grouped.phtml"/>
+            <block class="Magento\GroupedProduct\Block\Product\View\Type\Grouped" name="product.info.grouped" before="product.info.addtocart" template="Magento_GroupedProduct::product/view/type/grouped.phtml">
+                <arguments>
+                    <argument name="validateQuantityViewModel" xsi:type="object">Magento\GroupedProduct\ViewModel\ValidateQuantity</argument>
+                </arguments>
+            </block>
             <container name="product.info.grouped.extra" after="product.info.grouped" before="product.info.grouped" as="product_type_data_extra" label="Product Extra Info"/>
         </referenceContainer>
         <referenceContainer name="product.info.grouped.extra">
diff --git a/app/code/Magento/GroupedProduct/view/frontend/templates/product/view/type/grouped.phtml b/app/code/Magento/GroupedProduct/view/frontend/templates/product/view/type/grouped.phtml
index 996c61571563a..3662149d75211 100644
--- a/app/code/Magento/GroupedProduct/view/frontend/templates/product/view/type/grouped.phtml
+++ b/app/code/Magento/GroupedProduct/view/frontend/templates/product/view/type/grouped.phtml
@@ -1,31 +1,34 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 
 /**
  * Grouped product data template
  *
- * @var $block \Magento\Catalog\Block\Product\View\BaseImage
  * @var $block \Magento\GroupedProduct\Block\Product\View\Type\Grouped
+ * @var $escaper \Magento\Framework\Escaper
  */
 ?>
-<?php $block->setPreconfiguredValue(); ?>
-<?php $_product = $block->getProduct(); ?>
-<?php $_associatedProducts = $block->getAssociatedProducts(); ?>
-<?php $_hasAssociatedProducts = count($_associatedProducts) > 0; ?>
+<?php
+    $block->setPreconfiguredValue();
+    $_product = $block->getProduct();
+    $_associatedProducts = $block->getAssociatedProducts();
+    $_hasAssociatedProducts = count($_associatedProducts) > 0;
+    $viewModel = $block->getData('validateQuantityViewModel');
+?>
 
 <div class="table-wrapper grouped">
     <table class="table data grouped"
            id="super-product-table"
            data-mage-init='{ "Magento_GroupedProduct/js/product-ids-resolver": {} }'>
-        <caption class="table-caption"><?= $block->escapeHtml(__('Grouped product items')) ?></caption>
+        <caption class="table-caption"><?= $escaper->escapeHtml(__('Grouped product items')) ?></caption>
         <thead>
         <tr>
-            <th class="col item" scope="col"><?= $block->escapeHtml(__('Product Name')) ?></th>
+            <th class="col item" scope="col"><?= $escaper->escapeHtml(__('Product Name')) ?></th>
             <?php if ($_product->isSaleable()): ?>
-                <th class="col qty" scope="col"><?= $block->escapeHtml(__('Qty')) ?></th>
+                <th class="col qty" scope="col"><?= $escaper->escapeHtml(__('Qty')) ?></th>
             <?php endif; ?>
         </tr>
         </thead>
@@ -34,8 +37,8 @@
         <tbody>
             <?php foreach ($_associatedProducts as $_item): ?>
             <tr>
-                <td data-th="<?= $block->escapeHtml(__('Product Name')) ?>" class="col item">
-                    <strong class="product-item-name"><?= $block->escapeHtml($_item->getName()) ?></strong>
+                <td data-th="<?= $escaper->escapeHtml(__('Product Name')) ?>" class="col item">
+                    <strong class="product-item-name"><?= $escaper->escapeHtml($_item->getName()) ?></strong>
                     <?php if ($block->getCanShowProductPrice($_product)): ?>
                         <?php if ($block->getCanShowProductPrice($_item)): ?>
                             <?= /* @noEscape */ $block->getProductPrice($_item) ?>
@@ -43,21 +46,25 @@
                         <?php endif; ?>
                 </td>
                 <?php if ($_product->isSaleable()): ?>
-                <td data-th="<?= $block->escapeHtml(__('Qty')) ?>" class="col qty">
+                <td data-th="<?= $escaper->escapeHtml(__('Qty')) ?>" class="col qty">
                     <?php if ($_item->isSaleable()): ?>
                     <div class="control qty">
                         <input type="number"
-                               name="super_group[<?= $block->escapeHtmlAttr($_item->getId()) ?>]"
-                               data-selector="super_group[<?= $block->escapeHtmlAttr($_item->getId()) ?>]"
-                               value="<?= $block->escapeHtmlAttr($_item->getQty() * 1) ?>"
-                               title="<?= $block->escapeHtmlAttr(__('Qty')) ?>"
+                               name="super_group[<?= $escaper->escapeHtmlAttr($_item->getId()) ?>]"
+                               data-selector="super_group[<?= $escaper->escapeHtmlAttr($_item->getId()) ?>]"
+                               value="<?= $escaper->escapeHtmlAttr($_item->getQty() * 1) ?>"
+                               title="<?= $escaper->escapeHtmlAttr(__('Qty')) ?>"
                                class="input-text qty"
-                               data-validate="{'validate-grouped-qty':'#super-product-table'}"
+                               data-validate="<?= $escaper->escapeHtmlAttr($viewModel->getQuantityValidators(
+                                   $_item->getId(),
+                                   $_item->getWebsiteId()
+                               )) ?>"
+                               data-no-validation-for-zero-qty="true"
                                data-errors-message-box="#validation-message-box"/>
                     </div>
                 <?php else: ?>
-                    <div class="stock unavailable" title="<?= $block->escapeHtmlAttr(__('Availability')) ?>">
-                        <span><?= $block->escapeHtml(__('Out of stock')) ?></span>
+                    <div class="stock unavailable" title="<?= $escaper->escapeHtmlAttr(__('Availability')) ?>">
+                        <span><?= $escaper->escapeHtml(__('Out of stock')) ?></span>
                     </div>
                 <?php endif; ?>
                 </td>
@@ -85,7 +92,7 @@
             <tr>
                 <td class="unavailable"
                     colspan="<?php if ($_product->isSaleable()): ?>4<?php else: ?>3<?php endif; ?>">
-                    <?= $block->escapeHtml(__('No options of this product are available.')) ?>
+                    <?= $escaper->escapeHtml(__('No options of this product are available.')) ?>
                 </td>
             </tr>
         </tbody>
diff --git a/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_configure_type_grouped.xml b/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_configure_type_grouped.xml
index 92bb55ebd0ee1..27d63bad57c08 100644
--- a/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_configure_type_grouped.xml
+++ b/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_configure_type_grouped.xml
@@ -1,15 +1,19 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <attribute name="class" value="page-product-grouped"/>
         <referenceContainer name="product.info.form.content">
-            <block class="Magento\GroupedProduct\Block\Product\View\Type\Grouped" name="product.info.grouped" before="product.info.addtocart" template="Magento_GroupedProduct::product/view/type/grouped.phtml"/>
+            <block class="Magento\GroupedProduct\Block\Product\View\Type\Grouped" name="product.info.grouped" before="product.info.addtocart" template="Magento_GroupedProduct::product/view/type/grouped.phtml">
+                <arguments>
+                    <argument name="validateQuantityViewModel" xsi:type="object">Magento\GroupedProduct\ViewModel\ValidateQuantity</argument>
+                </arguments>
+            </block>
             <container name="product.info.grouped.extra" after="product.info.grouped" before="product.info.grouped" as="product_type_data_extra" label="Product Extra Info"/>
         </referenceContainer>
     </body>
diff --git a/lib/web/mage/validation.js b/lib/web/mage/validation.js
index 72baf69740c9b..3f1df78dcfdee 100644
--- a/lib/web/mage/validation.js
+++ b/lib/web/mage/validation.js
@@ -1643,6 +1643,9 @@ define([
                     isQtyIncrementsValid = typeof params.qtyIncrements === 'undefined' ||
                         resolveModulo(qty, $.mage.parseNumber(params.qtyIncrements)) === 0.0;
 
+                if ($(element).data('no-validation-for-zero-qty') === true && qty === 0) {
+                    return true;
+                }
                 result = qty > 0;
 
                 if (result === false) {