Fixed topic adding when empty