diff --git a/lib/private/legacy/app.php b/lib/private/legacy/app.php
index 1bdbd1e2a8..37de5fb491 100644
--- a/lib/private/legacy/app.php
+++ b/lib/private/legacy/app.php
@@ -209,8 +209,8 @@ class OC_App {
 			require_once $app . '/appinfo/app.php';
 		} catch (Error $ex) {
 			\OC::$server->getLogger()->logException($ex);
-			$blacklist = \OC::$server->getAppManager()->getAlwaysEnabledApps();
-			if (!in_array($app, $blacklist)) {
+			if (!\OC::$server->getAppManager()->isShipped($app)) {
+				// Only disable apps which are not shipped
 				self::disable($app);
 			}
 		}