diff --git a/lib/private/Server.php b/lib/private/Server.php
index eb49155ade..86eee54be7 100644
--- a/lib/private/Server.php
+++ b/lib/private/Server.php
@@ -644,7 +644,7 @@ class Server extends ServerContainer implements IServerContainer {
 		});
 		$this->registerService('ThemingDefaults', function(Server $c) {
 			try {
-				$classExists = class_exists('OCA\Theming\Template');
+				$classExists = class_exists('OCA\Theming\ThemingDefaults');
 			} catch (\OCP\AutoloadNotAllowedException $e) {
 				// App disabled or in maintenance mode
 				$classExists = false;
diff --git a/tests/lib/ServerTest.php b/tests/lib/ServerTest.php
index 534f3f8cfd..2e5900c4ce 100644
--- a/tests/lib/ServerTest.php
+++ b/tests/lib/ServerTest.php
@@ -158,6 +158,7 @@ class ServerTest extends \Test\TestCase {
 			['TagManager', '\OCP\ITagManager'],
 			['TempManager', '\OC\TempManager'],
 			['TempManager', '\OCP\ITempManager'],
+			['ThemingDefaults', '\OCA\Theming\ThemingDefaults'],
 			['TrustedDomainHelper', '\OC\Security\TrustedDomainHelper'],
 
 			['SystemTagManager', '\OCP\SystemTag\ISystemTagManager'],