diff --git a/src/sna/sna_render.c b/src/sna/sna_render.c
index 47bc19d9..88b23823 100644
--- a/src/sna/sna_render.c
+++ b/src/sna/sna_render.c
@@ -497,6 +497,9 @@ static struct kgem_bo *upload(struct sna *sna,
 
 	priv = sna_pixmap(pixmap);
 	if (priv) {
+		if (priv->cpu_damage == NULL)
+			return NULL;
+
 		/* As we know this box is on the CPU just fixup the shadow */
 		if (priv->mapped) {
 			pixmap->devPrivate.ptr = NULL;