diff --git a/C4/Items.pm b/C4/Items.pm
index e173dc21b1..89b092bfda 100644
--- a/C4/Items.pm
+++ b/C4/Items.pm
@@ -2709,7 +2709,11 @@ sub PrepareItemrecordDisplay {
                                 $authorised_lib{$branchcode} = $branchname;
                             }
                         }
-                        $defaultvalue = $defaultvalues->{branchcode} || C4::Context->userenv->{branch};
+
+                        $defaultvalue = C4::Context->userenv->{branch};
+                        if ( $defaultvalues and $defaultvalues->{branchcode} ) {
+                            $defaultvalue = $defaultvalues->{branchcode};
+                        }
 
                         #----- itemtypes
                     } elsif ( $tagslib->{$tag}->{$subfield}->{authorised_value} eq "itemtypes" ) {