diff --git a/src/Index/MappingBuilder.php b/src/Index/MappingBuilder.php
index 7633eca2d..d1a06a117 100644
--- a/src/Index/MappingBuilder.php
+++ b/src/Index/MappingBuilder.php
@@ -76,7 +76,7 @@ public function buildMapping(?string $model, IndexConfigInterface $indexConfig):
     {
         $mapping = $indexConfig->getMapping();
 
-        if (null !== $indexConfig->getDynamicDateFormats()) {
+        if (null !== $indexConfig->getDynamicDateFormats() && !empty($indexConfig->getDynamicDateFormats())) {
             $mapping['dynamic_date_formats'] = $indexConfig->getDynamicDateFormats();
         }