Revert "Ignore empty topics"

This reverts commit 03f94cc875ef380c3294109ca324bcf7919facf7.
Ignore empty topics,this time with a better and cleaner fix ;)