diff --git a/netbox/dcim/api/views.py b/netbox/dcim/api/views.py
index 6b0df22a8..da1f2379e 100644
--- a/netbox/dcim/api/views.py
+++ b/netbox/dcim/api/views.py
@@ -519,7 +519,7 @@ class RearPortViewSet(PassThroughPortMixin, NetBoxModelViewSet):
 
 
 class ModuleBayViewSet(NetBoxModelViewSet):
-    queryset = ModuleBay.objects.order_by('device', 'module', 'name')
+    queryset = ModuleBay.objects.all()
     serializer_class = serializers.ModuleBaySerializer
     filterset_class = filtersets.ModuleBayFilterSet
 
diff --git a/netbox/dcim/forms/model_forms.py b/netbox/dcim/forms/model_forms.py
index 947fb80d7..502c3b5ef 100644
--- a/netbox/dcim/forms/model_forms.py
+++ b/netbox/dcim/forms/model_forms.py
@@ -756,7 +756,6 @@ class ModuleForm(ModuleCommonForm, PrimaryModelForm):
         queryset=ModuleBay.objects.all(),
         query_params={
             'device_id': '$device',
-            'ordering': 'module,name',
         },
         context={
             'disabled': 'installed_module',