diff --git a/installer/data/mysql/atomicupdate/bug_7806.perl b/installer/data/mysql/atomicupdate/bug_7806.perl
index d30776d548..c027d2f2a1 100644
--- a/installer/data/mysql/atomicupdate/bug_7806.perl
+++ b/installer/data/mysql/atomicupdate/bug_7806.perl
@@ -1,19 +1,8 @@
 $DBversion = 'XXX'; # will be replaced by the RM
 if( CheckVersion( $DBversion ) ) {
 
-    eval {
-        local $dbh->{PrintError} = 0;
-        $dbh->do(q|
-            UPDATE aqorders
-            SET datecancellationprinted = NULL
-            WHERE datecancellationprinted = '0000-00-00'
-        |);
-        $dbh->do(q|
-            UPDATE old_issues
-            SET returndate = NULL
-            WHERE returndate = '0000-00-00'
-        |);
+    sanitize_zero_date('aqorders', 'datecancellationprinted');
+    sanitize_zero_date('old_issues', 'returndate');
 
-    };
     NewVersion( $DBversion, 7806, "Remove remaining possible 0000-00-00 values");
 }