diff --git a/Koha/Checkouts/ReturnClaim.pm b/Koha/Checkouts/ReturnClaim.pm
index 92ab38f08d..624c725949 100644
--- a/Koha/Checkouts/ReturnClaim.pm
+++ b/Koha/Checkouts/ReturnClaim.pm
@@ -48,7 +48,7 @@ exceptions as needed.
 sub store {
     my ( $self ) = @_;
 
-    unless ( $self->created_by ) {
+    unless ( $self->in_storage || $self->created_by ) {
         Koha::Exceptions::Checkouts::ReturnClaims::NoCreatedBy->throw();
     }
 
diff --git a/t/db_dependent/api/v1/return_claims.t b/t/db_dependent/api/v1/return_claims.t
index f0d8b1f24f..1664102c6f 100755
--- a/t/db_dependent/api/v1/return_claims.t
+++ b/t/db_dependent/api/v1/return_claims.t
@@ -204,6 +204,8 @@ subtest 'resolve_claim() tests' => sub {
 
     my $claim_id = $claim->id;
 
+    $claim->created_by(undef)->store; # resolve the claim must work even if the created_by patron has been removed
+
     # Resolve a claim
     $t->put_ok(
         "//$userid:$password@/api/v1/return_claims/$claim_id/resolve" => json => {