diff --git a/src/sna/gen2_render.c b/src/sna/gen2_render.c
index 3e907406..b539a815 100644
--- a/src/sna/gen2_render.c
+++ b/src/sna/gen2_render.c
@@ -1609,6 +1609,7 @@ gen2_composite_set_target(struct sna *sna,
 		if (bo == NULL)
 			return false;
 
+		sna_pixmap_unmap(op->dst.pixmap, priv);
 		kgem_bo_destroy(&sna->kgem, priv->gpu_bo);
 		priv->gpu_bo = bo;
 
diff --git a/src/sna/gen3_render.c b/src/sna/gen3_render.c
index e841396a..b3ee5673 100644
--- a/src/sna/gen3_render.c
+++ b/src/sna/gen3_render.c
@@ -3197,6 +3197,7 @@ gen3_composite_set_target(struct sna *sna,
 			if (bo == NULL)
 				return false;
 
+			sna_pixmap_unmap(op->dst.pixmap, priv);
 			kgem_bo_destroy(&sna->kgem, priv->gpu_bo);
 			priv->gpu_bo = bo;
 		}