diff --git a/src/Model/User.php b/src/Model/User.php
index 7b88aac189..46f0776b4e 100644
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -194,15 +194,13 @@ class User
 	public static function getFirstAdmin(array $fields = [])
 	{
 		if (!empty(DI::config()->get('config', 'admin_nickname'))) {
-			$administrator = self::getByNickname(DI::config()->get('config', 'admin_nickname'), $fields);
+			return self::getByNickname(DI::config()->get('config', 'admin_nickname'), $fields);
 		} elseif (!empty(DI::config()->get('config', 'admin_email'))) {
 			$adminList = explode(',', str_replace(' ', '', DI::config()->get('config', 'admin_email')));
-			$administrator = self::getByEmail($adminList[0], $fields);
+			return self::getByEmail($adminList[0], $fields);
+		} else {
+			return [];
 		}
-		if (!empty($administrator)) {
-			return $administrator;
-		}
-		return [];
 	}
 
 	/**