diff --git a/Koha/Item.pm b/Koha/Item.pm
index 91c15b22d5..247fae7cde 100644
--- a/Koha/Item.pm
+++ b/Koha/Item.pm
@@ -98,6 +98,9 @@ sub store {
         $self->itype($self->biblio->biblioitem->itemtype);
     }
 
+    # Ensure barcode is either defined or undef
+    $self->barcode(undef) if $self->barcode eq '';
+
     $self->barcode( C4::Circulation::barcodedecode( $self->barcode ) );
 
     my $today  = dt_from_string;