diff --git a/lib/private/NaturalSort.php b/lib/private/NaturalSort.php
index 240d4de637a..d367cc9d6e9 100644
--- a/lib/private/NaturalSort.php
+++ b/lib/private/NaturalSort.php
@@ -11,7 +11,6 @@ use OCP\Server;
 use Psr\Log\LoggerInterface;
 
 class NaturalSort {
-	private static $instance;
 	private $collator;
 	private $cache = [];
 
@@ -113,10 +112,7 @@ class NaturalSort {
 	 * Returns a singleton
 	 * @return NaturalSort instance
 	 */
-	public static function getInstance() {
-		if (!isset(self::$instance)) {
-			self::$instance = new NaturalSort();
-		}
-		return self::$instance;
+	public static function getInstance(): NaturalSort {
+		return \OCP\Server::get(NaturalSort::class);
 	}
 }