diff --git a/glamor/glamor.c b/glamor/glamor.c
index cbd0e02ad..d1aa1cfb0 100644
--- a/glamor/glamor.c
+++ b/glamor/glamor.c
@@ -226,6 +226,7 @@ glamor_destroy_textured_pixmap(PixmapPtr pixmap)
             glamor_egl_destroy_pixmap_image(pixmap);
 #endif
             glamor_pixmap_destroy_fbo(pixmap_priv);
+            glamor_set_pixmap_private(pixmap, NULL);
         }
     }
 }
diff --git a/glamor/glamor_fbo.c b/glamor/glamor_fbo.c
index 42738268c..d2aabb21c 100644
--- a/glamor/glamor_fbo.c
+++ b/glamor/glamor_fbo.c
@@ -540,8 +540,6 @@ glamor_pixmap_destroy_fbo(glamor_pixmap_private *priv)
         if (fbo)
             glamor_destroy_fbo(fbo);
     }
-
-    free(priv);
 }
 
 Bool