diff --git a/Koha/Account.pm b/Koha/Account.pm
index e3a2ef7f37..41be5dd8c2 100644
--- a/Koha/Account.pm
+++ b/Koha/Account.pm
@@ -224,6 +224,16 @@ sub add_credit {
     my $item_id       = $params->{item_id};
     my $issue_id      = $params->{issue_id};
 
+    my $old_issue_id;
+    if ( $issue_id ) {
+        my $issue = Koha::Checkouts->find($issue_id);
+        unless ( $issue ) {
+            my $old_issue = Koha::Old::Checkouts->find($issue_id);
+            $issue_id = undef;
+            $old_issue_id = $old_issue->id;
+        }
+    }
+
     Koha::Exceptions::Account::RegisterRequired->throw()
       if ( C4::Context->preference("UseCashRegisters")
         && defined($payment_type)
@@ -252,7 +262,16 @@ sub add_credit {
                         branchcode        => $library_id,
                         register_id       => $cash_register,
                         itemnumber        => $item_id,
-                        issue_id          => $issue_id,
+                        (
+                            $issue_id
+                            ? ( issue_id => $issue_id )
+                            : ()
+                        ),
+                        (
+                            $old_issue_id
+                            ? ( old_issue_id => $old_issue_id )
+                            : ()
+                        ),
                     }
                 )->store();