diff --git a/inc/field/fieldsfield.class.php b/inc/field/fieldsfield.class.php
index d66411b21..9ce06a134 100644
--- a/inc/field/fieldsfield.class.php
+++ b/inc/field/fieldsfield.class.php
@@ -208,13 +208,15 @@ public function prepareHtmlField($fieldName, $canedit = true, $value = '') {
          $field['value'] = $value;
       } else {
          //get default value
-         if ($this->getField()->fields['default_value'] !== "") {
+         if (!empty($this->getField()->fields['default_value'])) {
             $value = $this->getField()->fields['default_value'];
             // shortcut for date/datetime
             if (in_array($this->getField()->fields['type'], ['date', 'datetime'])
                   && $value == 'now') {
                $value = $_SESSION["glpi_currenttime"];
             }
+         } else {
+            $value = '';
          }
          $field['value'] = $value;
       }
@@ -506,7 +508,7 @@ public function isValid(): bool {
    private function isAdditionalFieldEmpty(): bool {
       switch ($this->getField()->fields['type']) {
          case 'dropdown':
-            return $this->getField()->fields['mandatory'] && $this->value == 0;
+            return $this->getField()->fields['mandatory'] && empty($this->value);
       }
 
       return $this->getField()->fields['mandatory'] && $this->value == '';