[ISSUE #8997] Ensure there is an opportunity to send a retry message when broker no response

[ISSUE #8997] Ensure there is an opportunity to send a retry message when broker no response #4420