diff --git a/C4/Circulation.pm b/C4/Circulation.pm
index 78215ffa35..adc7f8fe08 100644
--- a/C4/Circulation.pm
+++ b/C4/Circulation.pm
@@ -2499,9 +2499,11 @@ sub CalcDateDue {
 
 	# if ceilingDueDate ON the datedue can't be after the ceiling date
 	if ( C4::Context->preference('ceilingDueDate')
-	     && ( C4::Context->preference('ceilingDueDate') =~ C4::Dates->regexp('syspref') )
-	     && $datedue->output gt C4::Context->preference('ceilingDueDate') ) {
-	    $datedue = C4::Dates->new( C4::Context->preference('ceilingDueDate') );
+             && ( C4::Context->preference('ceilingDueDate') =~ C4::Dates->regexp('syspref') ) ) {
+            my $ceilingDate = C4::Dates->new( C4::Context->preference('ceilingDueDate') );
+            if ( $datedue->output( 'iso' ) gt $ceilingDate->output( 'iso' ) ) {
+                $datedue = $ceilingDate;
+            }
 	}
 
 	return $datedue;