Don't add empty metadata to received messages