diff --git a/C4/Circulation.pm b/C4/Circulation.pm
index 639b558c8a..29abc95ac7 100644
--- a/C4/Circulation.pm
+++ b/C4/Circulation.pm
@@ -2228,7 +2228,9 @@ sub AddReturn {
                 foreach my $notloan_rule_key (keys %{ $rules->{$item->itype}} ) {
                     if ( $item->notforloan eq $notloan_rule_key ) {
                         $messages->{'NotForLoanStatusUpdated'} = { from => $item->notforloan, to => $rules->{$item->itype}->{$notloan_rule_key} };
-                        $item->notforloan($rules->{$item->itype}->{$notloan_rule_key})->store({ log_action => 0, skip_record_index => 1, skip_holds_queue => 1 }) unless $rules->{$item->itype}->{$notloan_rule_key} eq 'ONLYMESSAGE';
+                        $item->notforloan( $rules->{ $item->itype }->{$notloan_rule_key} )
+                            ->store( { log_action => 0, skip_record_index => 1, skip_holds_queue => 1 } )
+                            unless $rules->{ $item->itype }->{$notloan_rule_key} eq 'ONLYMESSAGE';
                         last;
                     }
                 }
@@ -2236,7 +2238,9 @@ sub AddReturn {
                 foreach my $notloan_rule_key (keys %{ $rules->{'_ALL_'}} ) {
                     if ( $item->notforloan eq $notloan_rule_key ) {
                         $messages->{'NotForLoanStatusUpdated'} = { from => $item->notforloan, to => $rules->{'_ALL_'}->{$notloan_rule_key} };
-                        $item->notforloan($rules->{'_ALL_'}->{$notloan_rule_key})->store({ log_action => 0, skip_record_index => 1, skip_holds_queue => 1 });
+                        $item->notforloan( $rules->{'_ALL_'}->{$notloan_rule_key} )
+                            ->store( { log_action => 0, skip_record_index => 1, skip_holds_queue => 1 } )
+                            unless $rules->{ '_ALL_' }->{$notloan_rule_key} eq 'ONLYMESSAGE';
                         last;
                     }
                 }