diff --git a/lib/private/legacy/app.php b/lib/private/legacy/app.php
index 8114895416b6071c1709594cf41d0f890cf1ec63..a20a88ac08f7bfb3bdf7dcf5fe95f8a478d2f9e9 100644
--- a/lib/private/legacy/app.php
+++ b/lib/private/legacy/app.php
@@ -236,8 +236,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);
 			}
 		}