How to remove extra join in query builder?

Question

Laravel

There is a regular query to the database using query builder laravel
But also when getting a selection, a condition can be used

$user = USER::query
    ->where(active, '=', 1)
    ->join('roles', 'roles.user_id', '=', 'user_id')
    ->where(function ($query) {
        if($roleId) {
            $query->where('role', '=', $roleId)
        }
    })
    ->get()

Is it possible to somehow beautifully get rid of join if $roleId = null
So far, only such a solution comes to mind

$user = USER::query
    ->where(active, '=', 1)
    ->join('roles', function($join) {
         if($roleId) {
            $join->on('roles.user_id', '=', user.id)
        }
    })
    ->where(function ($query) {
        if($roleId) {
            $query->where('role', '=', $roleId)
        }
    })
    ->get()

Answer 1

$userQuery = USER::query()
    ->where(active, '=', 1);
if($roleId){
    $userQuery->join('roles', 'roles.user_id', '=', 'user_id')
    ->where('role', '=', $roleId);
}
$user = $userQuery->get()

Answer 2

Through relationships