diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index 9c8abef15f..c3d1593636 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -163,9 +163,11 @@ public function register(IRegistrationContext $context): void {
 			$context->registerSearchProvider(Provider::class);
 		}
 
-		// register mail provider
+		
 		// TODO: drop condition if nextcloud < 30 is not supported anymore
-		if (interface_exists(MailProvider::class)) {
+		// evaluate, if mail provider registration is possible
+		if (method_exists($context, 'registerMailProvider')) {
+			// register mail provider
 			$context->registerMailProvider(MailProvider::class);
 		}