diff --git a/lib/private/AppFramework/DependencyInjection/DIContainer.php b/lib/private/AppFramework/DependencyInjection/DIContainer.php
index a414772c4d..588f52e452 100644
--- a/lib/private/AppFramework/DependencyInjection/DIContainer.php
+++ b/lib/private/AppFramework/DependencyInjection/DIContainer.php
@@ -53,13 +53,11 @@ use OCP\AppFramework\QueryException;
 use OCP\Files\Folder;
 use OCP\Files\IAppData;
 use OCP\IL10N;
-use OCP\IMemcache;
 use OCP\IRequest;
 use OCP\IServerContainer;
 use OCP\IUserSession;
 use OCP\RichObjectStrings\IValidator;
 use OCP\Util;
-use SearchDAV\XML\Limit;
 
 class DIContainer extends SimpleContainer implements IAppContainer {
 
@@ -164,22 +162,6 @@ class DIContainer extends SimpleContainer implements IAppContainer {
 			return $c->query(Validator::class);
 		});
 
-		$this->registerService(OC\Security\RateLimiting\Limiter::class, function($c) {
-			return new OC\Security\RateLimiting\Limiter(
-				$this->getServer()->getUserSession(),
-				$this->getServer()->getRequest(),
-				new OC\AppFramework\Utility\TimeFactory(),
-				$c->query(OC\Security\RateLimiting\Backend\IBackend::class)
-			);
-		});
-
-		$this->registerService(OC\Security\RateLimiting\Backend\IBackend::class, function($c) {
-			return new OC\Security\RateLimiting\Backend\MemoryCache(
-				$this->getServer()->getMemCacheFactory(),
-				new OC\AppFramework\Utility\TimeFactory()
-			);
-		});
-
 		$this->registerService(\OC\Security\IdentityProof\Manager::class, function ($c) {
 			return new \OC\Security\IdentityProof\Manager(
 				$this->getServer()->getAppDataDir('identityproof'),
diff --git a/lib/private/Server.php b/lib/private/Server.php
index 00698a04f8..2aa7c15af0 100644
--- a/lib/private/Server.php
+++ b/lib/private/Server.php
@@ -516,6 +516,21 @@ class Server extends ServerContainer implements IServerContainer {
 		});
 		$this->registerAlias('Search', \OCP\ISearch::class);
 
+		$this->registerService(\OC\Security\RateLimiting\Limiter::class, function($c) {
+			return new \OC\Security\RateLimiting\Limiter(
+				$this->getUserSession(),
+				$this->getRequest(),
+				new \OC\AppFramework\Utility\TimeFactory(),
+				$c->query(\OC\Security\RateLimiting\Backend\IBackend::class)
+			);
+		});
+		$this->registerService(\OC\Security\RateLimiting\Backend\IBackend::class, function($c) {
+			return new \OC\Security\RateLimiting\Backend\MemoryCache(
+				$this->getMemCacheFactory(),
+				new \OC\AppFramework\Utility\TimeFactory()
+			);
+		});
+
 		$this->registerService(\OCP\Security\ISecureRandom::class, function ($c) {
 			return new SecureRandom();
 		});