SCAL-273: fixing stop implementation in case of monitoring on the infrastructure _side