diff --git a/lib/private/Server.php b/lib/private/Server.php
index c38965000f26d..54541ba127f5f 100644
--- a/lib/private/Server.php
+++ b/lib/private/Server.php
@@ -932,7 +932,7 @@ public function __construct($webRoot, \OC\Config $config) {
 
 		/** @deprecated 20.0.0 */
 		$this->registerDeprecatedAlias('IniWrapper', IniGetWrapper::class);
-		$this->registerService(IBus::class, function (ContainerInterface $c) {
+		$this->registerService('AsyncCommandBus', function (ContainerInterface $c) {
 			$busClass = $c->get(\OCP\IConfig::class)->getSystemValue('commandbus');
 			if ($busClass) {
 				[$app, $class] = explode('::', $busClass, 2);
@@ -947,7 +947,7 @@ public function __construct($webRoot, \OC\Config $config) {
 				return new CronBus($jobList);
 			}
 		});
-		$this->registerDeprecatedAlias('AsyncCommandBus', IBus::class);
+		$this->registerAlias(IBus::class, 'AsyncCommandBus');
 		/** @deprecated 20.0.0 */
 		$this->registerDeprecatedAlias('TrustedDomainHelper', TrustedDomainHelper::class);
 		/** @deprecated 19.0.0 */
@@ -1995,7 +1995,7 @@ public function getIniWrapper() {
 	 * @deprecated 20.0.0
 	 */
 	public function getCommandBus() {
-		return $this->get(IBus::class);
+		return $this->query('AsyncCommandBus');
 	}
 
 	/**