Fix condition when we don't the topic name field