Refs ZEN-14317: Fix for monitoring error