diff --git a/C4/Circulation.pm b/C4/Circulation.pm
index 87812a3ce1..a1f86b9f10 100644
--- a/C4/Circulation.pm
+++ b/C4/Circulation.pm
@@ -1988,6 +1988,7 @@ sub AddReturn {
 
         if ( $issue and $issue->is_overdue ) {
         # fix fine days
+            $today = $return_date if $return_date;
             $today = $dropboxdate if $dropbox;
             my ($debardate,$reminder) = _debar_user_on_return( $patron_unblessed, $item, dt_from_string($issue->date_due), $today );
             if ($reminder){