fix: #3619066 Don't register handlers unless enabled

This helps avoid potential circular references within services (repeatable on D11.3).

Closes #3619066