diff --git a/InventoryInStorePickup/Model/SearchCriteria/ResolveArea.php b/InventoryInStorePickup/Model/SearchCriteria/ResolveArea.php
index b75be918570..546c06cfca8 100644
--- a/InventoryInStorePickup/Model/SearchCriteria/ResolveArea.php
+++ b/InventoryInStorePickup/Model/SearchCriteria/ResolveArea.php
@@ -46,7 +46,7 @@ public function resolve(
     ): void {
         $codes = $this->getSourceCodes($searchRequest);
 
-        if ($codes !== null) {
+        if (!empty($codes)) {
             $codes = implode(',', $codes);
             $searchCriteriaBuilder->addFilter(SourceInterface::SOURCE_CODE, $codes, 'in');
         }
diff --git a/InventoryInStorePickup/Model/SearchCriteria/ResolveIntersection.php b/InventoryInStorePickup/Model/SearchCriteria/ResolveIntersection.php
index b75b48b148a..b5d954ad2b6 100644
--- a/InventoryInStorePickup/Model/SearchCriteria/ResolveIntersection.php
+++ b/InventoryInStorePickup/Model/SearchCriteria/ResolveIntersection.php
@@ -59,7 +59,9 @@ public function resolve(
         }
 
         $codes = $this->getPickupLocationIntersectionForSkus->execute($skus);
-        $codes = implode(',', $codes);
-        $searchCriteriaBuilder->addFilter(SourceInterface::SOURCE_CODE, $codes, 'in');
+        if (!empty($codes)) {
+            $codes = implode(',', $codes);
+            $searchCriteriaBuilder->addFilter(SourceInterface::SOURCE_CODE, $codes, 'in');
+        }
     }
 }