diff --git a/core/Listener/AddMissingIndicesListener.php b/core/Listener/AddMissingIndicesListener.php
index 27880fabeac9a..4f3160a4bf15a 100644
--- a/core/Listener/AddMissingIndicesListener.php
+++ b/core/Listener/AddMissingIndicesListener.php
@@ -150,10 +150,12 @@ public function handle(Event $event): void {
 		);
 
 
-		$event->addMissingIndex(
+		$event->replaceIndex(
 			'jobs',
-			'job_lastcheck_reserved',
-			['last_checked', 'reserved_at']
+			['job_lastcheck_reserved'],
+			'job_sensitive_lastcheck_reserved',
+			['time_sensitive', 'last_checked', 'reserved_at'],
+			false,
 		);
 
 		$event->addMissingIndex(
diff --git a/core/Migrations/Version13000Date20170718121200.php b/core/Migrations/Version13000Date20170718121200.php
index e3ac88a3e31af..b7f9bb695dea6 100644
--- a/core/Migrations/Version13000Date20170718121200.php
+++ b/core/Migrations/Version13000Date20170718121200.php
@@ -504,7 +504,7 @@ public function changeSchema(IOutput $output, \Closure $schemaClosure, array $op
 			]);
 			$table->setPrimaryKey(['id']);
 			$table->addIndex(['class'], 'job_class_index');
-			$table->addIndex(['last_checked', 'reserved_at'], 'job_lastcheck_reserved');
+			$table->addIndex(['time_sensitive', 'last_checked', 'reserved_at'], 'job_sensitive_lastcheck_reserved');
 		}
 
 		if (!$schema->hasTable('users')) {