diff --git a/app/Http/Controllers/Api/ComponentController.php b/app/Http/Controllers/Api/ComponentController.php
index 1a0de881..35c43a8a 100644
--- a/app/Http/Controllers/Api/ComponentController.php
+++ b/app/Http/Controllers/Api/ComponentController.php
@@ -32,7 +32,7 @@ class ComponentController extends AbstractApiController
     public function getComponents()
     {
         if (app(Guard::class)->check()) {
-            $components = Component::whereRaw('1 = 1');
+            $components = Component::query();
         } else {
             $components = Component::enabled();
         }
diff --git a/app/Http/Controllers/Api/ComponentGroupController.php b/app/Http/Controllers/Api/ComponentGroupController.php
index 9b747d25..f99c0987 100644
--- a/app/Http/Controllers/Api/ComponentGroupController.php
+++ b/app/Http/Controllers/Api/ComponentGroupController.php
@@ -29,7 +29,7 @@ class ComponentGroupController extends AbstractApiController
      */
     public function getGroups()
     {
-        $groups = ComponentGroup::whereRaw('1=1');
+        $groups = ComponentGroup::query();
 
         $groups->search(Binput::except(['sort', 'order', 'per_page']));
 
diff --git a/app/Http/Controllers/Api/MetricController.php b/app/Http/Controllers/Api/MetricController.php
index 56f47a60..c74907ce 100644
--- a/app/Http/Controllers/Api/MetricController.php
+++ b/app/Http/Controllers/Api/MetricController.php
@@ -29,7 +29,7 @@ class MetricController extends AbstractApiController
      */
     public function getMetrics()
     {
-        $metrics = Metric::whereRaw('1=1');
+        $metrics = Metric::query();
 
         if ($sortBy = Binput::get('sort')) {
             $direction = Binput::has('order') && Binput::get('order') == 'desc';