Fix remove broker fail