diff --git a/Koha/Checkouts/ReturnClaim.pm b/Koha/Checkouts/ReturnClaim.pm
index 78341e629a..c95c099a44 100644
--- a/Koha/Checkouts/ReturnClaim.pm
+++ b/Koha/Checkouts/ReturnClaim.pm
@@ -72,10 +72,21 @@ sub store {
 sub checkout {
     my ($self) = @_;
 
-    my $checkout = Koha::Checkouts->find( $self->issue_id )
-      || Koha::Old::Checkouts->find( $self->issue_id );
+    my $checkout_rs = $self->_result->checkout;
+    return unless $checkout_rs;
+    return Koha::Checkout->_new_from_dbic($checkout_rs);
+}
 
-    return $checkout;
+=head3 old_checkout
+
+=cut
+
+sub old_checkout {
+    my ($self) = @_;
+
+    my $old_checkout_rs = $self->_result->old_checkout;
+    return unless $old_checkout_rs;
+    return Koha::Old::Checkout->_new_from_dbic($old_checkout_rs);
 }
 
 =head3 patron
diff --git a/Koha/Schema/Result/ReturnClaim.pm b/Koha/Schema/Result/ReturnClaim.pm
index b554aebea1..472db5ecdd 100644
--- a/Koha/Schema/Result/ReturnClaim.pm
+++ b/Koha/Schema/Result/ReturnClaim.pm
@@ -256,7 +256,7 @@ __PACKAGE__->belongs_to(
 # Created by DBIx::Class::Schema::Loader v0.07049 @ 2022-02-23 19:37:50
 # DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:3V5bUmu5W3+XS0fa8uR04w
 
-=head2 issue
+=head2 checkout
 
 Type: belongs_to
 
@@ -265,7 +265,7 @@ Related object: L<Koha::Schema::Result::Issue>
 =cut
 
 __PACKAGE__->belongs_to(
-    "issue",
+    "checkout",
     "Koha::Schema::Result::Issue",
     { issue_id => "issue_id" },
     {
@@ -274,7 +274,7 @@ __PACKAGE__->belongs_to(
     },
 );
 
-=head2 old_issue
+=head2 old_checkout
 
 Type: belongs_to
 
@@ -283,7 +283,7 @@ Related object: L<Koha::Schema::Result::OldIssue>
 =cut
 
 __PACKAGE__->belongs_to(
-    "old_issue",
+    "old_checkout",
     "Koha::Schema::Result::OldIssue",
     { issue_id => "issue_id" },
     {