diff --git a/lib/private/appframework/dependencyinjection/dicontainer.php b/lib/private/appframework/dependencyinjection/dicontainer.php
index 175d6c747e..61a0448243 100644
--- a/lib/private/appframework/dependencyinjection/dicontainer.php
+++ b/lib/private/appframework/dependencyinjection/dicontainer.php
@@ -227,6 +227,10 @@ class DIContainer extends SimpleContainer implements IAppContainer {
 			return $this->getServer()->getSecureRandom();
 		});
 
+		$this->registerService('OCP\\Share\\IManager', function($c) {
+			return $this->getServer()->getShareManager();
+		});
+
 		$this->registerService('OCP\\SystemTag\\ISystemTagManager', function() {
 			return $this->getServer()->getSystemTagManager();
 		});
diff --git a/lib/private/server.php b/lib/private/server.php
index 4f731300ba..d453a42d3a 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -1256,9 +1256,8 @@ class Server extends ServerContainer implements IServerContainer {
 		return \OC_Mount_Config::$app->getContainer()->query('OCA\\Files_External\\Service\\UserStoragesService');
 	}
 
-
 	/**
-	 * @return \OC\Share20\Manager
+	 * @return \OCP\Share\IManager
 	 */
 	public function getShareManager() {
 		return $this->query('ShareManager');
diff --git a/lib/public/iservercontainer.php b/lib/public/iservercontainer.php
index e21c9fb8e4..ce1364cc4e 100644
--- a/lib/public/iservercontainer.php
+++ b/lib/public/iservercontainer.php
@@ -504,4 +504,12 @@ interface IServerContainer {
 	 * @since 9.0.0
 	 */
 	public function getSystemTagObjectMapper();
+
+	/**
+	 * Returns the share manager
+	 *
+	 * @return \OCP\Share\IManager
+	 * @since 9.0.0
+	 */
+	public function getShareManager();
 }
diff --git a/tests/lib/server.php b/tests/lib/server.php
index 91beea7c2f..8b2fec1f5a 100644
--- a/tests/lib/server.php
+++ b/tests/lib/server.php
@@ -139,6 +139,8 @@ class Server extends \Test\TestCase {
 			['Search', '\OCP\ISearch'],
 			['SecureRandom', '\OC\Security\SecureRandom'],
 			['SecureRandom', '\OCP\Security\ISecureRandom'],
+			['ShareManager', '\OC\Share20\Manager'],
+			['ShareManager', '\OCP\Share\IManager'],
 			['SystemConfig', '\OC\SystemConfig'],
 
 			['URLGenerator', '\OC\URLGenerator'],