Correctly handle empty repeated message