diff --git a/include/upgrader/streams/core/ed60ba20-934954de.patch.sql b/include/upgrader/streams/core/ed60ba20-934954de.patch.sql
index 39c210f4d1d7d9ffa65150243cb4cf81db96d552..9d3428177b9215d38992920c45b1ad6c6f548efe 100644
--- a/include/upgrader/streams/core/ed60ba20-934954de.patch.sql
+++ b/include/upgrader/streams/core/ed60ba20-934954de.patch.sql
@@ -18,10 +18,12 @@ UPDATE `%TABLE_PREFIX%filter_rule`
 -- Previously there was no primary key on the %ticket_email_info table, so
 -- clean up any junk records before adding one
 ALTER TABLE `%TABLE_PREFIX%ticket_email_info`
-    CHANGE `message_id` `thread_id` int(11) unsigned NOT NULL,
     DROP INDEX  `message_id`,
     ADD INDEX  `email_mid` (`email_mid`);
 
+ALTER TABLE `%TABLE_PREFIX%ticket_email_info`
+    CHANGE `message_id` `thread_id` int(11) unsigned NOT NULL;
+
 -- [#386](https://github.com/osTicket/osTicket-1.8/issues/386)
 UPDATE `%TABLE_PREFIX%email_template`
     SET `body` = REPLACE(`body`, '%{recipient}', '%{recipient.name}');