diff --git a/cataloguing/value_builder/marc21_linking_section.pl b/cataloguing/value_builder/marc21_linking_section.pl
index 0fb9b7bcfe..f537516c04 100755
--- a/cataloguing/value_builder/marc21_linking_section.pl
+++ b/cataloguing/value_builder/marc21_linking_section.pl
@@ -213,7 +213,7 @@ my $launcher = sub {
         }
         my @arrayresults;
         my @field_data = ($search);
-        for ( my $i = 0 ; $i < $resultsperpage ; $i++ ) {
+        for ( my $i = 0 ; $i < $total && $i < $resultsperpage ; $i++ ) {
             my $record = C4::Search::new_record_from_zebra( 'biblioserver', $results->[$i] );
             my $rechash = TransformMarcToKoha( $record );
             my $pos;
diff --git a/cataloguing/value_builder/unimarc_field_4XX.pl b/cataloguing/value_builder/unimarc_field_4XX.pl
index c51434954c..5b95f14581 100755
--- a/cataloguing/value_builder/unimarc_field_4XX.pl
+++ b/cataloguing/value_builder/unimarc_field_4XX.pl
@@ -399,7 +399,7 @@ sub plugin {
         my @field_data = ($search);
          for (
              my $i = 0 ;
-             $i < $resultsperpage ;
+             $i < $total && $i < $resultsperpage ;
              $i++
            )
          {