diff --git a/include/class.draft.php b/include/class.draft.php
index a4942ecb4bc5611fd9fa4572a3c0e1d022f893b0..cc6ad1fef9a2d7291c407ed61149dc690aa1eb4f 100644
--- a/include/class.draft.php
+++ b/include/class.draft.php
@@ -154,7 +154,8 @@ class Draft {
         // Keep client drafts for two weeks (14 days)
         $sql = 'DELETE FROM '.DRAFT_TABLE
             ." WHERE `namespace` LIKE 'ticket.client.%'
-            AND datediff(now(), updated) > 14";
+            AND ((updated IS NULL AND datediff(now(), created) > 14)
+                OR datediff(now(), updated) > 14)";
         return db_query($sql);
     }
 }