diff --git a/lib/private/Group/Database.php b/lib/private/Group/Database.php
index 7b7ee41def9b2..4c209bd128d6b 100644
--- a/lib/private/Group/Database.php
+++ b/lib/private/Group/Database.php
@@ -263,7 +263,7 @@ public function getUserGroups($uid) {
 	 *
 	 * Returns a list with all groups
 	 */
-	public function getGroups($search = '', $limit = null, $offset = null) {
+	public function getGroups($search = '', $limit = -1, $offset = 0) {
 		$this->fixDI();
 
 		$query = $this->dbConn->getQueryBuilder();
@@ -280,9 +280,11 @@ public function getGroups($search = '', $limit = null, $offset = null) {
 			)));
 		}
 
-		$query->setMaxResults($limit)
-			->setFirstResult($offset);
-		$result = $query->execute();
+		if ($limit > -1) {
+			$query->setMaxResults($limit);
+		}
+		$query->setFirstResult($offset);
+		$result = $query->executeQuery();
 
 		$groups = [];
 		while ($row = $result->fetch()) {
diff --git a/lib/private/Group/Manager.php b/lib/private/Group/Manager.php
index 28f7a400b41dd..abe6abf9b3474 100644
--- a/lib/private/Group/Manager.php
+++ b/lib/private/Group/Manager.php
@@ -238,7 +238,7 @@ public function createGroup($gid) {
 	public function search($search, $limit = null, $offset = null) {
 		$groups = [];
 		foreach ($this->backends as $backend) {
-			$groupIds = $backend->getGroups($search, $limit, $offset);
+			$groupIds = $backend->getGroups($search, $limit ?? -1, $offset ?? 0);
 			foreach ($groupIds as $groupId) {
 				$aGroup = $this->get($groupId);
 				if ($aGroup instanceof IGroup) {