Small fix when no token is passed