diff --git a/opac/opac-sendshelf.pl b/opac/opac-sendshelf.pl
index aa4eba2187..4b33d8ef97 100755
--- a/opac/opac-sendshelf.pl
+++ b/opac/opac-sendshelf.pl
@@ -26,7 +26,6 @@ use Try::Tiny qw( catch try );
 
 use C4::Auth qw( get_template_and_user );
 use C4::Biblio qw(
-    GetBiblioData
     GetFrameworkCode
     GetMarcBiblio
     GetMarcISBN
@@ -84,15 +83,15 @@ if ( $shelf and $shelf->can_be_viewed( $borrowernumber ) ) {
 
     while ( my $content = $contents->next ) {
         my $biblionumber = $content->biblionumber;
+        my $biblio       = Koha::Biblios->find( $biblionumber ) or next;
+        my $dat          = $biblio->unblessed;
         my $record           = GetMarcBiblio({
             biblionumber => $biblionumber,
             embed_items  => 1,
             opac         => 1,
             borcat       => $borcat });
         next unless $record;
-        my $biblio           = Koha::Biblios->find( $biblionumber );
         my $fw               = GetFrameworkCode($biblionumber);
-        my $dat              = GetBiblioData($biblionumber);
 
         my $marcauthorsarray = $biblio->get_marc_authors;
         my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour );
diff --git a/virtualshelves/sendshelf.pl b/virtualshelves/sendshelf.pl
index acb1a52d1d..06649a9889 100755
--- a/virtualshelves/sendshelf.pl
+++ b/virtualshelves/sendshelf.pl
@@ -26,7 +26,6 @@ use Try::Tiny qw( catch try );
 
 use C4::Auth qw( get_template_and_user );
 use C4::Biblio qw(
-    GetBiblioData
     GetMarcBiblio
     GetMarcISBN
     GetMarcSubjects
@@ -72,8 +71,8 @@ if ($to_address) {
 
     while ( my $content = $contents->next ) {
         my $biblionumber     = $content->biblionumber;
-        my $biblio           = Koha::Biblios->find( $biblionumber );
-        my $dat              = GetBiblioData($biblionumber);
+        my $biblio           = Koha::Biblios->find( $biblionumber ) or next;
+        my $dat              = $biblio->unblessed;
         my $record           = GetMarcBiblio({
             biblionumber => $biblionumber,
             embed_items  => 1 });