diff --git a/src/main/java/org/olat/group/ui/main/AbstractBusinessGroupListController.java b/src/main/java/org/olat/group/ui/main/AbstractBusinessGroupListController.java
index ff6a582ed294b144303fb2839f0bc3b82adfff49..22f5a9043ff361b9821d234869f0f02c7064b832 100644
--- a/src/main/java/org/olat/group/ui/main/AbstractBusinessGroupListController.java
+++ b/src/main/java/org/olat/group/ui/main/AbstractBusinessGroupListController.java
@@ -201,6 +201,12 @@ public abstract class AbstractBusinessGroupListController extends BasicControlle
 		return admin;
 	}
 	
+	protected boolean isEmpty() {
+		return groupListCtr == null ? true :
+			(groupListCtr.getTableDataModel() == null ? true :
+				groupListCtr.getTableDataModel().getRowCount() == 0);
+	}
+	
 	@Override
 	protected void doDispose() {
 		//
diff --git a/src/main/java/org/olat/group/ui/main/OverviewBusinessGroupListController.java b/src/main/java/org/olat/group/ui/main/OverviewBusinessGroupListController.java
index 44a956cda85b438e610bd97aa11428f853be6fa9..bae424fc2738520d54f4a3515d1f4a5f51b47c01 100644
--- a/src/main/java/org/olat/group/ui/main/OverviewBusinessGroupListController.java
+++ b/src/main/java/org/olat/group/ui/main/OverviewBusinessGroupListController.java
@@ -65,8 +65,8 @@ public class OverviewBusinessGroupListController extends BasicController impleme
 		
 		mainVC = createVelocityContainer("group_list_overview");
 		
-		boolean marked = updateMarkedGroups(ureq).updateMarkedGroups();
-		if(!marked) {
+		boolean markedEmpty = updateMarkedGroups(ureq).isEmpty();
+		if(markedEmpty) {
 			updateAllGroups(ureq);
 		}
 		
@@ -74,10 +74,10 @@ public class OverviewBusinessGroupListController extends BasicController impleme
 		segmentView = SegmentViewFactory.createSegmentView("segments", mainVC, this);
 		markedGroupsLink = LinkFactory.createLink("marked.groups", mainVC, this);
 		markedGroupsLink.setElementCssClass("o_sel_group_bookmarked_groups_seg");
-		segmentView.addSegment(markedGroupsLink, marked);
+		segmentView.addSegment(markedGroupsLink, !markedEmpty);
 		allGroupsLink = LinkFactory.createLink("opengroups.all", mainVC, this);
 		allGroupsLink.setElementCssClass("o_sel_group_all_groups_seg");
-		segmentView.addSegment(allGroupsLink, !marked);
+		segmentView.addSegment(allGroupsLink, markedEmpty);
 		ownedGroupsLink = LinkFactory.createLink("owned.groups", mainVC, this);
 		ownedGroupsLink.setElementCssClass("o_sel_group_owned_groups_seg");
 		segmentView.addSegment(ownedGroupsLink, false);