diff --git a/CHANGELOG.md b/CHANGELOG.md
index 82e2a30..6500f7a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,11 @@ To see every change with descriptions aimed at developers, see
 As a continuously updated web app, Coauthor uses dates
 instead of version numbers.
 
+## 2023-11-21
+
+* Only cluster by leading tags in the sort order, so if you click to sort by
+  e.g. Updated then there's no longer awkward clustering by repeated tags.
+
 ## 2023-11-17
 
 * Fix scrolling to a message when clicking on it in table of contents
diff --git a/client/group.coffee b/client/group.coffee
index 86ec456..3f5342f 100644
--- a/client/group.coffee
+++ b/client/group.coffee
@@ -132,8 +132,9 @@ export Group = React.memo ({group, groupData}) ->
     for sort in sortBy
       if sort.key.startsWith 'tag.'
         clusterBy.push sort.key[4..]
-      #else
-      #  primarySort ?= sort
+      else
+        break
+        #primarySort ?= sort
     clusterBy = null unless clusterBy.length
     clusterBy
     #{clusterBy, primarySort}