diff --git a/core/Application.php b/core/Application.php
index c25fb4fb6f457..ffe4f60549c0f 100644
--- a/core/Application.php
+++ b/core/Application.php
@@ -244,6 +244,12 @@ public function __construct() {
 				'systag_by_tagid',
 				['systemtagid', 'objecttype']
 			);
+
+			$event->addMissingIndex(
+				'systemtag_object_mapping',
+				'systag_by_objectid',
+				['objectid']
+			);
 		});
 
 		$eventDispatcher->addListener(AddMissingPrimaryKeyEvent::class, function (AddMissingPrimaryKeyEvent $event) {