diff --git a/lib/Controller/ConfigController.php b/lib/Controller/ConfigController.php
index 539c19e79..c63991435 100644
--- a/lib/Controller/ConfigController.php
+++ b/lib/Controller/ConfigController.php
@@ -103,12 +103,15 @@ class ConfigController extends Controller {
 		$groups = array_map(function($groupId) {
 			/** @var IGroup $groups */
 			$group = $this->groupManager->get($groupId);
+			if ($group === null) {
+				return null;
+			}
 			return [
 				'id' => $group->getGID(),
 				'displayname' => $group->getDisplayName(),
 			];
 		}, $groups);
-		return $groups;
+		return array_filter($groups);
 	}
 
 }