diff --git a/core/Application.php b/core/Application.php
index 8a6faf3049c21..0c4670beaade4 100644
--- a/core/Application.php
+++ b/core/Application.php
@@ -315,19 +315,16 @@ function (GenericEvent $event) use ($container) {
 		$eventDispatcher->addServiceListener(UserDeletedEvent::class, UserDeletedFilesCleanupListener::class);
 		$eventDispatcher->addServiceListener(UserDeletedEvent::class, UserDeletedWebAuthnCleanupListener::class);
 
-		/** @var IEventDispatcher $eventDispatcher */
-		$newEventDispatcher = \OC::$server->get(IEventDispatcher::class);
-
 		// Metadata
 		/** @var IConfig $config */
 		$config = $container->get(IConfig::class);
 		if ($config->getSystemValueBool('enable_file_metadata', true)) {
-			$newEventDispatcher->addServiceListener(NodeDeletedEvent::class, FileEventListener::class);
-			$newEventDispatcher->addServiceListener(NodeRemovedFromCache::class, FileEventListener::class);
-			$newEventDispatcher->addServiceListener(NodeWrittenEvent::class, FileEventListener::class);
+			$eventDispatcher->addServiceListener(NodeDeletedEvent::class, FileEventListener::class);
+			$eventDispatcher->addServiceListener(NodeRemovedFromCache::class, FileEventListener::class);
+			$eventDispatcher->addServiceListener(NodeWrittenEvent::class, FileEventListener::class);
 		}
 
 		// Tags
-		$newEventDispatcher->addServiceListener(UserDeletedEvent::class, TagManager::class);
+		$eventDispatcher->addServiceListener(UserDeletedEvent::class, TagManager::class);
 	}
 }