diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
index 5e72d21891..1691f9dbfa 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
@@ -414,7 +414,9 @@
                                     <input type="hidden" name="from" value="opac_user" />
                                     <input type="hidden" name="borrowernumber" value="[% borrowernumber | html %]" />
                                     [% FOREACH ISSUE IN ISSUES %]
-                                        <input type="hidden" name="item" value="[% ISSUE.itemnumber | html %]" />
+                                        [% IF ISSUE.status %]
+                                            <input type="hidden" name="item" value="[% ISSUE.itemnumber | html %]" />
+                                        [% END %]
                                     [% END %]
                                     <input type="submit" class="btn" value="Renew all" />
                                 </form>
diff --git a/opac/opac-user.pl b/opac/opac-user.pl
index 18c983fa35..a380d88f01 100755
--- a/opac/opac-user.pl
+++ b/opac/opac-user.pl
@@ -190,6 +190,7 @@ my @overdues;
 my @issuedat;
 my $itemtypes = { map { $_->{itemtype} => $_ } @{ Koha::ItemTypes->search_with_localization->unblessed } };
 my $pending_checkouts = $patron->pending_checkouts->search({}, { order_by => [ { -desc => 'date_due' }, { -asc => 'issue_id' } ] });
+my $are_renewable_items = 0;
 if ( $pending_checkouts->count ) { # Useless test
     while ( my $c = $pending_checkouts->next ) {
         my $issue = $c->unblessed_all_relateds;
@@ -226,6 +227,7 @@ if ( $pending_checkouts->count ) { # Useless test
         ( $issue->{'renewalfee'}, $issue->{'renewalitemtype'} ) = GetIssuingCharges( $issue->{'itemnumber'}, $borrowernumber );
         $issue->{itemtype_object} = Koha::ItemTypes->find( Koha::Items->find( $issue->{itemnumber} )->effective_itemtype );
         if($status && C4::Context->preference("OpacRenewalAllowed")){
+            $are_renewable_items = 1;
             $issue->{'status'} = $status;
         }
 
@@ -299,7 +301,7 @@ if ( $pending_checkouts->count ) { # Useless test
     }
 }
 my $overduesblockrenewing = C4::Context->preference('OverduesBlockRenewing');
-$canrenew = 0 if ($overduesblockrenewing ne 'allow' and $overdues_count == $count);
+$canrenew = 0 if ($overduesblockrenewing ne 'allow' and $overdues_count == $count) || !$are_renewable_items;
 
 $template->param( ISSUES       => \@issuedat );
 $template->param( issues_count => $count );