diff --git a/Koha/Item.pm b/Koha/Item.pm
index e5d4bbccd6..d2f337772d 100644
--- a/Koha/Item.pm
+++ b/Koha/Item.pm
@@ -179,8 +179,7 @@ sub store {
 
 
         if (    exists $updated_columns{location}
-            and $self->location ne 'CART'
-            and $self->location ne 'PROC'
+            and ( !defined($self->location) or $self->location !~ /^(CART|PROC)$/ )
             and not exists $updated_columns{permanent_location} )
         {
             $self->permanent_location( $self->location );