diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetHashtags.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/GetHashtags.java
index ddb5eabe25..b6c4d299e2 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetHashtags.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/GetHashtags.java
@@ -40,6 +40,6 @@ public class GetHashtags implements RestReadView<ChangeResource> {
     if (hashtags == null) {
       hashtags = Collections.emptySet();
     }
-    return Response.ok(new TreeSet<String>(hashtags));
+    return Response.ok(hashtags);
   }
 }
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeNotes.java b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeNotes.java
index 2d5d4ad45a..d89651bc8e 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeNotes.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeNotes.java
@@ -24,6 +24,7 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableListMultimap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSetMultimap;
+import com.google.common.collect.ImmutableSortedSet;
 import com.google.common.collect.Ordering;
 import com.google.common.collect.Table;
 import com.google.common.primitives.Ints;
@@ -165,8 +166,12 @@ public class ChangeNotes extends AbstractChangeNotes<ChangeNotes> {
     return reviewers;
   }
 
+  /**
+   *
+   * @return a ImmutableSet of all hashtags for this change sorted in alphabetical order.
+   */
   public ImmutableSet<String> getHashtags() {
-    return hashtags;
+    return ImmutableSortedSet.copyOf(hashtags);
   }
 
   /**