diff --git a/src/Model/GServer.php b/src/Model/GServer.php
index af03041498..57b533a93a 100644
--- a/src/Model/GServer.php
+++ b/src/Model/GServer.php
@@ -349,9 +349,9 @@ class GServer
 		}
 
 		// On a redirect follow the new host but mark the old one as failure
-		if ($curlResult->isSuccess() && (parse_url($url, PHP_URL_HOST) != parse_url($curlResult->getRedirectUrl(), PHP_URL_HOST))) {
+		if ($curlResult->isSuccess() && !empty($curlResult->getRedirectUrl()) && (parse_url($url, PHP_URL_HOST) != parse_url($curlResult->getRedirectUrl(), PHP_URL_HOST))) {
 			$curlResult = DI::httpClient()->get($url, [HttpClientOptions::TIMEOUT => $xrd_timeout]);
-			if (parse_url($url, PHP_URL_HOST) != parse_url($curlResult->getRedirectUrl(), PHP_URL_HOST)) {
+			if (!empty($curlResult->getRedirectUrl()) && parse_url($url, PHP_URL_HOST) != parse_url($curlResult->getRedirectUrl(), PHP_URL_HOST)) {
 				Logger::info('Found redirect. Mark old entry as failure', ['old' => $url, 'new' => $curlResult->getRedirectUrl()]);
 				self::setFailure($url);
 				self::detect($curlResult->getRedirectUrl(), $network, $only_nodeinfo);
@@ -388,7 +388,7 @@ class GServer
 
 				$curlResult = DI::httpClient()->get($baseurl, [HttpClientOptions::TIMEOUT => $xrd_timeout]);
 				if ($curlResult->isSuccess()) {
-					if ((parse_url($baseurl, PHP_URL_HOST) != parse_url($curlResult->getRedirectUrl(), PHP_URL_HOST))) {
+					if (!empty($curlResult->getRedirectUrl()) && (parse_url($baseurl, PHP_URL_HOST) != parse_url($curlResult->getRedirectUrl(), PHP_URL_HOST))) {
 						Logger::info('Found redirect. Mark old entry as failure', ['old' => $url, 'new' => $curlResult->getRedirectUrl()]);
 						self::setFailure($url);
 						self::detect($curlResult->getRedirectUrl(), $network, $only_nodeinfo);
diff --git a/src/Module/Api/Mastodon/Apps.php b/src/Module/Api/Mastodon/Apps.php
index 582232642a..c1e6a222d5 100644
--- a/src/Module/Api/Mastodon/Apps.php
+++ b/src/Module/Api/Mastodon/Apps.php
@@ -37,6 +37,7 @@ class Apps extends BaseApi
 	{
 		return parent::run($request, false);
 	}
+
 	/**
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
diff --git a/src/Module/OAuth/Acknowledge.php b/src/Module/OAuth/Acknowledge.php
index 477d3dfcf3..b06fa9f230 100644
--- a/src/Module/OAuth/Acknowledge.php
+++ b/src/Module/OAuth/Acknowledge.php
@@ -24,12 +24,18 @@ namespace Friendica\Module\OAuth;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Module\BaseApi;
+use Psr\Http\Message\ResponseInterface;
 
 /**
  * Acknowledgement of OAuth requests
  */
 class Acknowledge extends BaseApi
 {
+	public function run(array $request = [], bool $scopecheck = true): ResponseInterface
+	{
+		return parent::run($request, false);
+	}
+
 	protected function post(array $request = [])
 	{
 		DI::session()->set('oauth_acknowledge', true);
diff --git a/src/Module/OAuth/Revoke.php b/src/Module/OAuth/Revoke.php
index 86bc01ced4..525fdd97e7 100644
--- a/src/Module/OAuth/Revoke.php
+++ b/src/Module/OAuth/Revoke.php
@@ -26,12 +26,18 @@ use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Module\BaseApi;
+use Psr\Http\Message\ResponseInterface;
 
 /**
  * @see https://docs.joinmastodon.org/spec/oauth/
  */
 class Revoke extends BaseApi
 {
+	public function run(array $request = [], bool $scopecheck = true): ResponseInterface
+	{
+		return parent::run($request, false);
+	}
+
 	protected function post(array $request = [])
 	{
 		$request = $this->getRequest([
diff --git a/src/Module/OAuth/Token.php b/src/Module/OAuth/Token.php
index efd4000f67..1790b887d9 100644
--- a/src/Module/OAuth/Token.php
+++ b/src/Module/OAuth/Token.php
@@ -28,6 +28,7 @@ use Friendica\DI;
 use Friendica\Module\BaseApi;
 use Friendica\Security\OAuth;
 use Friendica\Util\DateTimeFormat;
+use Psr\Http\Message\ResponseInterface;
 
 /**
  * @see https://docs.joinmastodon.org/spec/oauth/
@@ -35,6 +36,11 @@ use Friendica\Util\DateTimeFormat;
  */
 class Token extends BaseApi
 {
+	public function run(array $request = [], bool $scopecheck = true): ResponseInterface
+	{
+		return parent::run($request, false);
+	}
+
 	protected function post(array $request = [])
 	{
 		$request = $this->getRequest([