Can we use a new schedule assignment to prompt the end date of a payroll element's eligibility?

We currently have to manually end date an element eligibility when we have public safety employees changing from a 24 hour work schedule to an 8 hour work schedule and then back to the 24 hour work schedule. The element is only applicable to the 24 hour work schedule and therefore causes an error when we attempt to change the schedule back to the 24 hour schedule.