diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/ProductDataMapper.php b/app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/ProductDataMapper.php
index 270ca37e2d42c..7b0f9cfe4b274 100644
--- a/app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/ProductDataMapper.php
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/ProductDataMapper.php
@@ -252,9 +252,14 @@ private function prepareAttributeValues(
      */
     private function prepareMultiselectValues(array $values): array
     {
-        return \array_merge(...\array_map(function (string $value) {
-            return \explode(',', $value);
-        }, $values));
+        return \array_merge(
+            ...\array_map(
+                function (string $value) {
+                    return \explode(',', $value);
+                },
+                $values
+            )
+        );
     }
 
     /**
@@ -285,9 +290,9 @@ private function getValuesLabels(Attribute $attribute, array $attributeValues):
             return $attributeLabels;
         }
 
-        foreach ($options as $option) {
-            if (\in_array($option->getValue(), $attributeValues)) {
-                $attributeLabels[] = $option->getLabel();
+        foreach ($attributeValues as $attributeValue) {
+            if (isset($options[$attributeValue])) {
+                $attributeLabels[] = $options[$attributeValue]->getLabel();
             }
         }
 
@@ -304,7 +309,11 @@ private function getAttributeOptions(Attribute $attribute): array
     {
         if (!isset($this->attributeOptionsCache[$attribute->getId()])) {
             $options = $attribute->getOptions() ?? [];
-            $this->attributeOptionsCache[$attribute->getId()] = $options;
+            $optionsByValue = [];
+            foreach ($options as $option) {
+                $optionsByValue[$option->getValue()] = $option;
+            }
+            $this->attributeOptionsCache[$attribute->getId()] = $optionsByValue;
         }
 
         return $this->attributeOptionsCache[$attribute->getId()];