diff --git a/lib/private/AllConfig.php b/lib/private/AllConfig.php
index 4e13d70371b7f..a58aec4aeeac2 100644
--- a/lib/private/AllConfig.php
+++ b/lib/private/AllConfig.php
@@ -358,12 +358,17 @@ public function deleteAppFromAllUsers($appName) {
 	 *     ]
 	 */
 	private function getUserValues($userId) {
-		// TODO - FIXME
-		$this->fixDIInit();
-
 		if (isset($this->userCache[$userId])) {
 			return $this->userCache[$userId];
 		}
+		if ($userId === null || $userId === '') {
+			$this->userCache[$userId]=array();
+			return $this->userCache[$userId];
+		}
+
+		// TODO - FIXME
+		$this->fixDIInit();
+
 		$data = array();
 		$query = 'SELECT `appid`, `configkey`, `configvalue` FROM `*PREFIX*preferences` WHERE `userid` = ?';
 		$result = $this->connection->executeQuery($query, array($userId));