diff --git a/installer/data/mysql/atomicupdate/bug_5087_-_add_opac_option_field_to_export_formats.perl b/installer/data/mysql/atomicupdate/bug_5087_-_add_opac_option_field_to_export_formats.perl
index 7eaffd409d..41ee9459f4 100644
--- a/installer/data/mysql/atomicupdate/bug_5087_-_add_opac_option_field_to_export_formats.perl
+++ b/installer/data/mysql/atomicupdate/bug_5087_-_add_opac_option_field_to_export_formats.perl
@@ -8,5 +8,12 @@ if( CheckVersion( $DBversion ) ) {
         |);
     }
 
+    unless ( index_exists( 'export_format', 'used_for_idx' ) ) {
+        $dbh->do(q|
+            ALTER TABLE export_format
+                ADD KEY `used_for_idx` (`used_for` (191));
+        |);
+    }
+
     NewVersion( $DBversion, 5087, "Add export_format.staff_only" );
 }
diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index 456f7b1134..49cdb3bc33 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -693,6 +693,7 @@ CREATE TABLE `export_format` (
   `used_for` varchar(255) DEFAULT 'export_records',
   `staff_only` TINYINT(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`export_format_id`),
+  KEY `used_for_idx` (`used_for` (191)),
   KEY `staff_only_idx` (`staff_only`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Used for CSV export';