diff --git a/C4/Circulation.pm b/C4/Circulation.pm
index 5f642c2f90..a83e59671c 100644
--- a/C4/Circulation.pm
+++ b/C4/Circulation.pm
@@ -2535,29 +2535,29 @@ sub AddReturn {
     }
 
     if ( C4::Context->preference('ClaimReturnedLostValue') ) {
-        my $autoClaimReturnCheckin = C4::Context->preference('AutoClaimReturnStatusOnCheckin');
 
-        if ($autoClaimReturnCheckin) {
             my $claim = Koha::Checkouts::ReturnClaims->find(
                 {
                     itemnumber => $item->id,
                     resolution => undef,
                 }
             );
-
             if ($claim) {
-                my $patron_id  = $patron->borrowernumber;
-                my $resolution = $autoClaimReturnCheckin;
+                my $autoClaimReturnCheckin = C4::Context->preference('AutoClaimReturnStatusOnCheckin');
+                if ($autoClaimReturnCheckin) {
 
-                $claim->resolve(
-                    {
-                        resolution  => $resolution,
-                        resolved_by => $patron_id,
-                    }
-                );
-                $messages->{ClaimAutoResolved} = $claim;
-            } else {
-                $messages->{ReturnClaims} = $claim if $claim;
+                    my $patron_id  = $patron->borrowernumber;
+                    my $resolution = $autoClaimReturnCheckin;
+
+                    $claim->resolve(
+                        {
+                            resolution  => $resolution,
+                            resolved_by => $patron_id,
+                        }
+                    );
+                    $messages->{ClaimAutoResolved} = $claim;
+                } else {
+                    $messages->{ReturnClaims} = $claim;
             }
         }
     }