diff --git a/src/Model/Nodeinfo.php b/src/Model/Nodeinfo.php
index 2fd05af64a..398666185d 100644
--- a/src/Model/Nodeinfo.php
+++ b/src/Model/Nodeinfo.php
@@ -101,7 +101,7 @@ class Nodeinfo
 	 *
 	 * @return array with supported services
 	*/
-	public static function getServices()
+	public static function getServices(): array
 	{
 		$services = [
 			'inbound'  => [],
@@ -156,12 +156,16 @@ class Nodeinfo
 		return $services;
 	}
 
-	public static function getOrganization($config)
+	public static function getOrganization()
 	{
-		$organization = ['name' => null, 'contact' => null, 'account' => null];
+		$organization = [
+			'name' => null,
+			'contact' => null,
+			'account' => null
+		];
 
-		if (!empty($config->get('config', 'admin_email'))) {
-			$adminList = explode(',', str_replace(' ', '', $config->get('config', 'admin_email')));
+		if (!empty(DI::config()->get('config', 'admin_email'))) {
+			$adminList = explode(',', str_replace(' ', '', DI::config()->get('config', 'admin_email')));
 			$organization['contact'] = $adminList[0];
 			$administrator = User::getByEmail($adminList[0], ['username', 'nickname']);
 			if (!empty($administrator)) {
diff --git a/src/Module/NodeInfo210.php b/src/Module/NodeInfo210.php
index 7e9291b492..99b2fd05a8 100644
--- a/src/Module/NodeInfo210.php
+++ b/src/Module/NodeInfo210.php
@@ -57,7 +57,7 @@ class NodeInfo210 extends BaseModule
 				'software' => 'friendica',
 				'version'  => FRIENDICA_VERSION . '-' . DB_UPDATE_VERSION,
 			],
-			'organization'      => Nodeinfo::getOrganization($this->config),
+			'organization'      => Nodeinfo::getOrganization(),
 			'protocols'         => ['dfrn', 'activitypub'],
 			'services'          => [],
 			'openRegistrations' => intval($this->config->get('config', 'register_policy')) !== Register::CLOSED,