[DF-2176] Added stop when empty support