diff --git a/lib/private/App/AppManager.php b/lib/private/App/AppManager.php
index 2721725bf94..3316bb9cd12 100644
--- a/lib/private/App/AppManager.php
+++ b/lib/private/App/AppManager.php
@@ -204,7 +204,7 @@ class AppManager implements IAppManager {
 		if ($values[$appId] === 'yes' || $values[$appId] === 'no') {
 			return [];
 		}
-		return json_decode($values[$appId]);
+		return json_decode($values[$appId], true);
 	}
 
 
diff --git a/lib/private/Updater.php b/lib/private/Updater.php
index c8f78c4a937..8885d4dcff7 100644
--- a/lib/private/Updater.php
+++ b/lib/private/Updater.php
@@ -466,7 +466,7 @@ class Updater extends BasicEmitter {
 
 				if (!empty($previousEnableStates)) {
 					$ocApp = new \OC_App();
-					if (!empty($previousEnableStates[$app])) {
+					if (!empty($previousEnableStates[$app]) && is_array($previousEnableStates[$app])) {
 						$ocApp->enable($app, $previousEnableStates[$app]);
 					} else {
 						$ocApp->enable($app);