diff --git a/C4/Circulation.pm b/C4/Circulation.pm
index fba723f7f8..7434d647ce 100644
--- a/C4/Circulation.pm
+++ b/C4/Circulation.pm
@@ -3513,6 +3513,11 @@ sub CalcDateDue {
                 $datedue = $expiry_dt->clone->set_time_zone( C4::Context->tz );
             }
         }
+        if ( C4::Context->preference('useDaysMode') ne 'Days' ) {
+          # Don't return on a closed day
+          my $calendar = Koha::Calendar->new( branchcode => $branch );
+          $datedue = $calendar->prev_open_day( $datedue );
+        }
     }
 
     return $datedue;