diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/business/GradebookNgBusinessService.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/business/GradebookNgBusinessService.java
index 4300c3d9b78c..f225eab78b1b 100644
--- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/business/GradebookNgBusinessService.java
+++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/business/GradebookNgBusinessService.java
@@ -1795,21 +1795,17 @@ public List<GbStudentGradeInfo> sortGradeMatrix(Map<String, GbStudentGradeInfo>
 	 */
 	public List<GbGroup> getSiteSectionsAndGroups() {
 		final String siteId = getCurrentSiteId();
+		final String userId = getCurrentUser().getId();
 
 		final List<GbGroup> rval = new ArrayList<>();
 
-		GbRole role;
-		try {
-			role = this.getUserRole(siteId);
-		} catch (final GbAccessDeniedException e) {
-			log.warn("Could not fetch the users role in site [{}], {}", siteId, e.toString());
-			return rval;
-		}
-
 		// get groups (handles both groups and sections)
 		try {
 			final Site site = this.siteService.getSite(siteId);
-			final Collection<Group> groups = isSuperUser() || role == GbRole.INSTRUCTOR ? site.getGroups() : site.getGroupsWithMember(userDirectoryService.getCurrentUser().getId());
+
+			final List<PermissionDefinition> perms = getPermissionsForUser(userId, siteId);
+
+			final Collection<Group> groups = !perms.isEmpty() ? site.getGroups() : site.getGroupsWithMember(userDirectoryService.getCurrentUser().getId());
 
 			for (final Group group : groups) {
 				rval.add(new GbGroup(group.getId(), group.getTitle(), group.getReference(), GbGroup.Type.GROUP));
@@ -1820,6 +1816,13 @@ public List<GbGroup> getSiteSectionsAndGroups() {
 			log.error("Error retrieving groups", e);
 		}
 
+		GbRole role;
+		try {
+			role = this.getUserRole(siteId);
+		} catch (final GbAccessDeniedException e) {
+			log.warn("Could not fetch the users role in site [{}], {}", siteId, e.toString());
+			return rval;
+		}
 
 		// if user is a TA, get the groups they can see and filter the GbGroup
 		// list to keep just those