diff --git a/app/Traits/Scopes.php b/app/Traits/Scopes.php
index 136a11a74..3eee9ec9c 100644
--- a/app/Traits/Scopes.php
+++ b/app/Traits/Scopes.php
@@ -22,10 +22,8 @@ trait Scopes
             return;
         }
 
-        $type = request()->get('type') ?: $this->getTypeFromUrl();
-
         // Apply type scope
-        $builder->where($model->getTable() . '.type', '=', $type);
+        $builder->where($model->getTable() . '.type', '=', $this->getTypeFromRequest());
     }
 
     /**
@@ -60,9 +58,9 @@ trait Scopes
         return false;
     }
 
-    public function getTypeFromUrl()
+    public function getTypeFromRequest()
     {
-        $type = Str::singular(request()->segment(2, ''));
+        $type = request()->get('type') ?: Str::singular(request()->segment(2, ''));
 
         if ($type == 'revenue') {
             $type = 'income';