diff --git a/core/opds.py b/core/opds.py
index 90162f483..9dec1c0eb 100644
--- a/core/opds.py
+++ b/core/opds.py
@@ -1029,13 +1029,15 @@ def make_link(ep):
         for facet in all_order_facets:
             order = dict(parse_qsl(facet["href"])).get('order')
             if order in enabled_order_facets:
+                facets.order = order
+                if order == original_facet:
+                    facet = cls.facet_link(href=facet["href"], title=facet["title"], facet_group_name="Sort by", is_active=True)
+                else:
+                    facet = cls.facet_link(href=facet["href"], title=facet["title"], facet_group_name="Sort by", is_active=False)
                 # cls.facet_links generates a /feed/ url, but we want to use
                 # search_url to generate a /search/ url. We also want to generate
                 # the facet url for this given ordering facet instead of the original facet.
-                facets.order = order
                 facet["href"] = annotator.search_url(lane, query, pagination=None, facets=facets)
-                if order == original_facet:
-                    facet["href"] += "&active=true"
                 AcquisitionFeed.add_link_to_feed(feed=opds_feed.feed, **facet)
         facets.order = original_facet