XD-1063: Fix mqtt props