diff --git a/Koha/Account.pm b/Koha/Account.pm
index b4838bcdf2..55ee594ff8 100644
--- a/Koha/Account.pm
+++ b/Koha/Account.pm
@@ -203,9 +203,9 @@ sub pay {
         # If we need to make a note of the item associated with this line,
         # in order that we can potentially renew it, do so.
         my $amt = $old_amountoutstanding - $amount_to_pay;
-        if ($fine->renewable) {
+        if ( $fine->renewable ) {
             my $outcome = $fine->renew_item;
-            push @{$renew_outcomes}, $outcome;
+            push @{$renew_outcomes}, $outcome if $outcome;
         }
 
         if ( C4::Context->preference('MarkLostItemsAsReturned') =~ m|onpayment|
diff --git a/Koha/Account/Line.pm b/Koha/Account/Line.pm
index 2cc81993ef..185c753772 100644
--- a/Koha/Account/Line.pm
+++ b/Koha/Account/Line.pm
@@ -901,7 +901,9 @@ sub renewable {
         $self->debit_type_code &&
         $self->debit_type_code eq 'OVERDUE' &&
         $self->status &&
-        $self->status eq 'UNRETURNED'
+        $self->status eq 'UNRETURNED' &&
+        $self->item &&
+        $self->patron
     ) ? 1 : 0;
 }
 
@@ -919,19 +921,14 @@ sub renew_item {
 
     my $outcome = {};
 
-    # We want to reject the call to renew if any of these apply:
+    # We want to reject the call to renew if:
     # - The RenewAccruingItemWhenPaid syspref is off
-    # - The line item doesn't have an item attached to it
-    # - The line item doesn't have a patron attached to it
-    #
+    # OR
     # - The RenewAccruingItemInOpac syspref is off
-    # AND
     # - There is an interface param passed and it's value is 'opac'
 
     if (
         !C4::Context->preference('RenewAccruingItemWhenPaid') ||
-        !$self->item ||
-        !$self->patron ||
         (
             !C4::Context->preference('RenewAccruingItemInOpac') &&
             $params->{interface} &&