diff --git a/include/upgrader/sql/f8856d56-abe9c0cb.patch.sql b/include/upgrader/sql/f8856d56-abe9c0cb.patch.sql
index c0e5dd298482de89fda33bb04edf011d478f0b4d..e78ab80cc525fac35fc81061bc970ef89dc950f0 100644
--- a/include/upgrader/sql/f8856d56-abe9c0cb.patch.sql
+++ b/include/upgrader/sql/f8856d56-abe9c0cb.patch.sql
@@ -92,7 +92,7 @@ INSERT INTO `%TABLE_PREFIX%ticket_email_info`
                AND `thread_type` = 'M' ),
          `messageId`, `headers`
     FROM `%TABLE_PREFIX%ticket_message`
-    WHERE `messageId` IS NOT NULL;
+    WHERE `messageId` IS NOT NULL AND `messageId` <>'';
 
 -- Update attachment table
 UPDATE `%TABLE_PREFIX%ticket_attachment`