Fix duplicate (and erroneous) conversation storage