diff --git a/include/upgrader/patches/f8856d56-abe9c0cb.patch.sql b/include/upgrader/patches/f8856d56-abe9c0cb.patch.sql
index 56adf02bcf1ade285f17bffd119ca386ac167fa6..c0e5dd298482de89fda33bb04edf011d478f0b4d 100644
--- a/include/upgrader/patches/f8856d56-abe9c0cb.patch.sql
+++ b/include/upgrader/patches/f8856d56-abe9c0cb.patch.sql
@@ -59,10 +59,13 @@ INSERT INTO `%TABLE_PREFIX%ticket_thread`
 
 -- Connect responses to (new) messages
 CREATE TABLE `%TABLE_PREFIX%T_resp_links`
-    SELECT `id`, `old_pk`, `old_pid`, `thread_type`
+    SELECT `id`, `old_pk`
       FROM `%TABLE_PREFIX%ticket_thread`
      WHERE `thread_type` = 'M';
 
+-- Add an index to speed up the linking process
+ALTER TABLE `%TABLE_PREFIX%T_resp_links` ADD KEY `old_pk` (`old_pk`, `id`);
+
 UPDATE `%TABLE_PREFIX%ticket_thread`
     SET `pid` = ( SELECT T2.`id` FROM `%TABLE_PREFIX%T_resp_links` T2
                   WHERE `old_pid` = T2.`old_pk` )