Add condition about empty status list