diff --git a/lib/private/App/AppManager.php b/lib/private/App/AppManager.php
index 5cd00d09b95..1cb8e1e80c9 100644
--- a/lib/private/App/AppManager.php
+++ b/lib/private/App/AppManager.php
@@ -560,8 +560,8 @@ class AppManager implements IAppManager {
 
 		if (!empty($info['collaboration']['plugins'])) {
 			// deal with one or many plugin entries
-			$plugins = isset($info['collaboration']['plugins']['plugin']['@value'])
-				? [$info['collaboration']['plugins']['plugin']] : $info['collaboration']['plugins']['plugin'];
+			$plugins = isset($info['collaboration']['plugins']['@value'])
+				? [$info['collaboration']['plugins']] : $info['collaboration']['plugins'];
 			$collaboratorSearch = null;
 			$autoCompleteManager = null;
 			foreach ($plugins as $plugin) {
diff --git a/lib/private/App/InfoParser.php b/lib/private/App/InfoParser.php
index 340ad8f31fa..e034ee4c31d 100644
--- a/lib/private/App/InfoParser.php
+++ b/lib/private/App/InfoParser.php
@@ -171,11 +171,8 @@ class InfoParser {
 		if (isset($array['activity']['providers']['provider']) && is_array($array['activity']['providers']['provider'])) {
 			$array['activity']['providers'] = $array['activity']['providers']['provider'];
 		}
-		if (isset($array['collaboration']['collaborators']['searchPlugins']['searchPlugin'])
-			&& is_array($array['collaboration']['collaborators']['searchPlugins']['searchPlugin'])
-			&& !isset($array['collaboration']['collaborators']['searchPlugins']['searchPlugin']['class'])
-		) {
-			$array['collaboration']['collaborators']['searchPlugins'] = $array['collaboration']['collaborators']['searchPlugins']['searchPlugin'];
+		if (isset($array['collaboration']['plugins']['plugin']) && is_array($array['collaboration']['plugins']['plugin'])) {
+			$array['collaboration']['plugins'] = $array['collaboration']['plugins']['plugin'];
 		}
 		if (isset($array['settings']['admin']) && !is_array($array['settings']['admin'])) {
 			$array['settings']['admin'] = [$array['settings']['admin']];