diff --git a/typo3/sysext/form/Classes/ViewHelpers/Form/DatePickerViewHelper.php b/typo3/sysext/form/Classes/ViewHelpers/Form/DatePickerViewHelper.php
index 1795343c7a9c1d423b01df4be3540038eaa48406..938b2c8f7af32360f00bafbb99aebd13b0a03844 100644
--- a/typo3/sysext/form/Classes/ViewHelpers/Form/DatePickerViewHelper.php
+++ b/typo3/sysext/form/Classes/ViewHelpers/Form/DatePickerViewHelper.php
@@ -81,7 +81,7 @@ class DatePickerViewHelper extends AbstractFormFieldViewHelper
         $enableDatePicker = $this->arguments['enableDatePicker'];
         $dateFormat = $this->arguments['dateFormat'];
         $previewMode = (bool)$this->arguments['previewMode'];
-        $placeholder = $this->arguments['placeholder'];
+        $placeholder = $this->arguments['placeholder'] ?? $this->arguments['additionalAttributes']['placeholder'];
 
         $name = $this->getName();
         $this->registerFieldNameForFormTokenGeneration($name);
diff --git a/typo3/sysext/form/Configuration/Yaml/FormEditorSetup.yaml b/typo3/sysext/form/Configuration/Yaml/FormEditorSetup.yaml
index f9ce552d3ea7f7e36ecfc64813b49cc0628698bd..f09dab60822d1ce1233ff3f7243c2917298a160c 100644
--- a/typo3/sysext/form/Configuration/Yaml/FormEditorSetup.yaml
+++ b/typo3/sysext/form/Configuration/Yaml/FormEditorSetup.yaml
@@ -683,6 +683,12 @@ TYPO3:
                     templateName: 'Inspector-TextEditor'
                     label: 'formEditor.elements.DatePicker.editor.dateFormat.label'
                     propertyPath: 'properties.dateFormat'
+                  350:
+                    identifier: 'placeholder'
+                    templateName: 'Inspector-TextEditor'
+                    label: 'formEditor.elements.TextMixin.editor.placeholder.label'
+                    propertyPath: 'properties.fluidAdditionalAttributes.placeholder'
+                    doNotSetIfPropertyValueIsEmpty: true
                   400:
                     identifier: 'enableDatePicker'
                     templateName: 'Inspector-CheckboxEditor'