[CB-7104] Fix for the missing plugin message

Please have a look at this. This might not be the cleanest fix for [CB-7104], but it does the job. It will toggle only when messages are in the queue.