diff --git a/lib/mapping.c b/lib/mapping.c
index 8f932267b..3885b0d84 100644
--- a/lib/mapping.c
+++ b/lib/mapping.c
@@ -347,9 +347,9 @@ int mapping_remap(struct list *m, struct sample *remapped, struct sample *origin
 
 	/* We copy all the header fields */
 	remapped->sequence = original->sequence;
-	remapped->pool_off = (char *) sample_pool(original) - (char *) remapped;
 	remapped->source   = original->source;
 	remapped->ts       = original->ts;
+	remapped->id       = original->id;
 
 	for (size_t i = 0; i < list_length(m); i++) {
 		struct mapping_entry *me = list_at(m, i);
diff --git a/lib/sample.c b/lib/sample.c
index 547f75904..8a9bddd92 100644
--- a/lib/sample.c
+++ b/lib/sample.c
@@ -96,8 +96,8 @@ int sample_copy(struct sample *dst, struct sample *src)
 	dst->sequence = src->sequence;
 	dst->format = src->format;
 	dst->source = src->source;
+	dst->id = src->id;
 	dst->flags = src->flags;
-
 	dst->ts = src->ts;
 
 	memcpy(&dst->data, &src->data, SAMPLE_DATA_LEN(dst->length));