diff --git a/apps/oauth2/lib/Db/ClientMapper.php b/apps/oauth2/lib/Db/ClientMapper.php
index 8531f6d007..38751a2e5c 100644
--- a/apps/oauth2/lib/Db/ClientMapper.php
+++ b/apps/oauth2/lib/Db/ClientMapper.php
@@ -46,6 +46,11 @@ class ClientMapper extends Mapper {
 		$result = $qb->execute();
 		$row = $result->fetch();
 		$result->closeCursor();
+
+		if (!is_array($row)) {
+			$row = [];
+		}
+
 		return Client::fromRow($row);
 	}