Fix duplicate messages on empty strings