diff --git a/app/code/Magento/InventoryInStorePickup/Model/PickupLocation/Mapper/CreateFromSource.php b/app/code/Magento/InventoryInStorePickup/Model/PickupLocation/Mapper/CreateFromSource.php
index 90a8a8af6706..2f91f5395ec1 100644
--- a/app/code/Magento/InventoryInStorePickup/Model/PickupLocation/Mapper/CreateFromSource.php
+++ b/app/code/Magento/InventoryInStorePickup/Model/PickupLocation/Mapper/CreateFromSource.php
@@ -67,7 +67,7 @@ public function execute(SourceInterface $source, array $map, array $preProcessor
     private function preProcessData(SourceInterface $source, array $data, array $preProcessors)
     {
         foreach ($preProcessors as $field => $processor) {
-            if (isset($data[$field])) {
+            if (array_key_exists($field, $data)) {
                 $data[$field] = $processor->process($source, $data[$field]);
             }
         }
diff --git a/app/code/Magento/InventoryInStorePickup/Model/PickupLocation/Mapper/PreProcessor/FrontendName.php b/app/code/Magento/InventoryInStorePickup/Model/PickupLocation/Mapper/PreProcessor/FrontendName.php
new file mode 100644
index 000000000000..a4f1b8bc436c
--- /dev/null
+++ b/app/code/Magento/InventoryInStorePickup/Model/PickupLocation/Mapper/PreProcessor/FrontendName.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ *  Copyright © Magento, Inc. All rights reserved.
+ *  See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\InventoryInStorePickup\Model\PickupLocation\Mapper\PreProcessor;
+
+use Magento\InventoryApi\Api\Data\SourceInterface;
+use Magento\InventoryInStorePickupApi\Model\Mapper\PreProcessorInterface;
+
+class FrontendName implements PreProcessorInterface
+{
+
+    /**
+     * Process Source Field before pass it to Pickup Location
+     *
+     * @param SourceInterface $source
+     * @param string $value Frontend Name Extension Attribute value
+     *
+     * @return string
+     */
+    public function process(SourceInterface $source, $value): string
+    {
+        if (empty($value)) {
+            $value = $source->getName();
+        }
+
+        return $value;
+    }
+}
diff --git a/app/code/Magento/InventoryInStorePickup/Plugin/InventoryApi/SourceValidatorChain/SetFrontendName.php b/app/code/Magento/InventoryInStorePickup/Plugin/InventoryApi/SourceValidatorChain/SetFrontendName.php
deleted file mode 100644
index 2a11e5ac3c6a..000000000000
--- a/app/code/Magento/InventoryInStorePickup/Plugin/InventoryApi/SourceValidatorChain/SetFrontendName.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-declare(strict_types=1);
-
-namespace Magento\InventoryInStorePickup\Plugin\InventoryApi\SourceValidatorChain;
-
-use Magento\Framework\DataObject;
-use Magento\InventoryApi\Api\Data\SourceInterface;
-use Magento\InventoryApi\Model\SourceValidatorChain;
-
-/**
- * Set frontend name the same as regular name if it is empty
- */
-class SetFrontendName
-{
-    /**
-     * @param SourceValidatorChain $chain
-     * @param SourceInterface $source
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     */
-    public function beforeValidate(SourceValidatorChain $chain, SourceInterface $source)
-    {
-        if ($source->getExtensionAttributes() === null) {
-            return;
-        }
-
-        $frontendName = trim($source->getExtensionAttributes()->getFrontendName() ?? '');
-
-        if ($frontendName === '') {
-            $source->getExtensionAttributes()->setFrontendName($source->getName());
-            if ($source instanceof DataObject) {
-                $source->setData('frontend_name', $source->getExtensionAttributes()->getFrontendName());
-            }
-        }
-    }
-}
diff --git a/app/code/Magento/InventoryInStorePickup/Test/Integration/PickupLocation/MapperTest.php b/app/code/Magento/InventoryInStorePickup/Test/Integration/PickupLocation/MapperTest.php
index ec353dd5179a..0481a4076523 100644
--- a/app/code/Magento/InventoryInStorePickup/Test/Integration/PickupLocation/MapperTest.php
+++ b/app/code/Magento/InventoryInStorePickup/Test/Integration/PickupLocation/MapperTest.php
@@ -120,6 +120,22 @@ public function testMapPickupLocation()
         $this->assertInstanceOf(PickupLocationExtensionInterface::class, $pickupLocation->getExtensionAttributes());
     }
 
+    /**
+     * @magentoDataFixture ../../../../app/code/Magento/InventoryInStorePickup/Test/_files/pickup_location.php
+     * @throws
+     */
+    public function testEmptyFrontendName()
+    {
+        $source = $this->sourceRepository->get($this->sourceCode);
+        $source->getExtensionAttributes()->setFrontendName(null);
+
+        /** @var  Mapper $mapper */
+        $mapper = $this->objectManager->create(Mapper::class);
+
+        $pickupLocation = $mapper->map($source);
+        $this->assertEquals($source->getName(), $pickupLocation->getName());
+    }
+
     /**
      * @return array
      */
diff --git a/app/code/Magento/InventoryInStorePickup/etc/di.xml b/app/code/Magento/InventoryInStorePickup/etc/di.xml
index 63a9bb91cb68..b8abb4c70197 100644
--- a/app/code/Magento/InventoryInStorePickup/etc/di.xml
+++ b/app/code/Magento/InventoryInStorePickup/etc/di.xml
@@ -38,12 +38,11 @@
                 <item name="extension_attributes.frontend_name" xsi:type="string">name</item>
                 <item name="extension_attributes.frontend_description" xsi:type="string">description</item>
             </argument>
+            <argument name="preProcessors" xsi:type="array">
+                <item name="extension_attributes.frontend_name" xsi:type="object">Magento\InventoryInStorePickup\Model\PickupLocation\Mapper\PreProcessor\FrontendName</item>
+            </argument>
         </arguments>
     </type>
-    <type name="Magento\InventoryApi\Model\SourceValidatorChain">
-        <plugin name="store-pickup-set-frontend-name"
-                type="Magento\InventoryInStorePickup\Plugin\InventoryApi\SourceValidatorChain\SetFrontendName" />
-    </type>
     <type name="Magento\InventoryInStorePickup\Model\SourceSelection\GetActiveStorePickupOrdersBySource">
         <arguments>
             <argument name="statesToFilter" xsi:type="array">