diff --git a/CHANGELOG.md b/CHANGELOG.md
index ac66d83e3..192e3de14 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+2.5.12 (2019-04-30)
+
+## Bug Fixes
+
+* [#3127](https://github.com/digitalocean/netbox/issues/3127) - Fix natural ordering of device components
+
+---
+
 2.5.11 (2019-04-29)
 
 ## Notes
diff --git a/netbox/utilities/managers.py b/netbox/utilities/managers.py
index 724773c46..fc2497063 100644
--- a/netbox/utilities/managers.py
+++ b/netbox/utilities/managers.py
@@ -37,4 +37,8 @@ class NaturalOrderingManager(Manager):
             else:
                 ordering.append(field)
 
+        # Default to using the _nat indexes if Meta.ordering is empty
+        if not ordering:
+            ordering = ('_nat1', '_nat2', '_nat3')
+
         return queryset.order_by(*ordering)