diff --git a/server/pulp/server/managers/repo/unit_association_query.py b/server/pulp/server/managers/repo/unit_association_query.py
index ad55c1f..bbeac39 100644
--- a/server/pulp/server/managers/repo/unit_association_query.py
+++ b/server/pulp/server/managers/repo/unit_association_query.py
@@ -411,10 +411,13 @@ class RepoUnitAssociationQueryManager(object):
         sort = criteria.unit_sort
 
         if sort is None:
-            unit_key = types_db.type_units_unit_key(unit_type_id)
+            # dgregor - HACK - sort by _id so we use a single index
+            sort = [('_id', SORT_ASCENDING)]
 
-            if unit_key is not None:
-                sort = [(u, SORT_ASCENDING) for u in unit_key]
+            #unit_key = types_db.type_units_unit_key(unit_type_id)
+            #
+            #if unit_key is not None:
+            #    sort = [(u, SORT_ASCENDING) for u in unit_key]
 
         if sort is not None:
             cursor.sort(sort)