diff --git a/pkg/services/accesscontrol/database/database.go b/pkg/services/accesscontrol/database/database.go
index 8b704ddd7bb..eac6ba968f8 100644
--- a/pkg/services/accesscontrol/database/database.go
+++ b/pkg/services/accesscontrol/database/database.go
@@ -26,8 +26,7 @@ func (s *AccessControlStore) GetUserPermissions(ctx context.Context, query acces
 	err := s.sql.WithDbSession(ctx, func(sess *sqlstore.DBSession) error {
 		filter, params := userRolesFilter(query.OrgID, query.UserID, query.Roles)
 
-		// TODO: optimize this
-		q := `SELECT DISTINCT
+		q := `SELECT
 			permission.action,
 			permission.scope
 			FROM permission
@@ -45,10 +44,6 @@ func (s *AccessControlStore) GetUserPermissions(ctx context.Context, query acces
 			}
 		}
 
-		q += `
-			ORDER BY permission.scope
-		`
-
 		if err := sess.SQL(q, params...).Find(&result); err != nil {
 			return err
 		}