diff --git a/frappe/email/doctype/unhandled_email/unhandled_email.py b/frappe/email/doctype/unhandled_email/unhandled_email.py
index 9f9357c1f2..a106d84103 100644
--- a/frappe/email/doctype/unhandled_email/unhandled_email.py
+++ b/frappe/email/doctype/unhandled_email/unhandled_email.py
@@ -11,4 +11,5 @@ class UnhandledEmail(Document):
 
 
 def remove_old_unhandled_emails():
-	frappe.db.sql("""DELETE FROM `tabUnhandled Email` WHERE DATEDIFF(CURRENT_DATE(), DATE(creation)) > 30""")
+	frappe.db.sql("""DELETE FROM `tabUnhandled Email` 
+	WHERE creation < %s""", frappe.utils.add_days(frappe.utils.nowdate(), -30))