diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py
index c71a92de59..edf7c92d0f 100644
--- a/django/contrib/admin/options.py
+++ b/django/contrib/admin/options.py
@@ -295,8 +295,12 @@ class ModelAdmin(BaseModelAdmin):
         Returns a QuerySet of all model instances that can be edited by the
         admin site. This is used by changelist_view.
         """
+        qs = self.model._default_manager.get_query_set()
+        # TODO: this should be handled by some parameter to the ChangeList.
         ordering = self.ordering or () # otherwise we might try to *None, which is bad ;)
-        return self.model._default_manager.get_query_set().order_by(*ordering)
+        if ordering:
+            qs.order_by(*ordering)
+        return qs
 
     def get_fieldsets(self, request, obj=None):
         "Hook for specifying fieldsets for the add form."