diff --git a/Koha/Object/Mixin/AdditionalFields.pm b/Koha/Object/Mixin/AdditionalFields.pm
index b69d461252..086b45683f 100644
--- a/Koha/Object/Mixin/AdditionalFields.pm
+++ b/Koha/Object/Mixin/AdditionalFields.pm
@@ -77,7 +77,7 @@ sub set_additional_fields {
             }
         }
 
-        if (defined $value) {
+        if (defined $value && $value ne '') {
             my $field_value = Koha::AdditionalFieldValue->new({
                 field_id => $additional_field->{id},
                 record_id => $self->id,
@@ -113,7 +113,7 @@ sub prepare_cgi_additional_field_values {
             push @additional_fields, {
                 id    => $field->id,
                 value => $value,
-            } if defined $value && $value ne '';
+            } if defined $value;
         }
     }