diff --git a/src/cairo-xlib-surface.c b/src/cairo-xlib-surface.c
index 58576b8..5310e18 100644
--- a/src/cairo-xlib-surface.c
+++ b/src/cairo-xlib-surface.c
@@ -372,6 +372,10 @@ _cairo_xlib_surface_discard_shm (cairo_xlib_surface_t *surface)
     cairo_surface_destroy (surface->shm);
 
     surface->shm = NULL;
+
+    _cairo_damage_destroy (surface->base.damage);
+    surface->base.damage = NULL;
+    surface->fallback = 0;
 }
 
 static cairo_status_t