diff --git a/app/Models/ComponentGroup.php b/app/Models/ComponentGroup.php
index f130cf49..b595b990 100644
--- a/app/Models/ComponentGroup.php
+++ b/app/Models/ComponentGroup.php
@@ -125,7 +125,7 @@ class ComponentGroup extends Model implements HasPresenter
      */
     public function components()
     {
-        return $this->hasMany(Component::class, 'group_id', 'id')->orderBy('order');
+        return $this->hasMany(Component::class, 'group_id', 'id');
     }
 
     /**
@@ -145,7 +145,7 @@ class ComponentGroup extends Model implements HasPresenter
      */
     public function enabled_components()
     {
-        return $this->components()->enabled();
+        return $this->components()->enabled()->orderBy('order');
     }
 
     /**