diff --git a/randr/rrcrtc.c b/randr/rrcrtc.c
index 2fb92b053..42421b1ce 100644
--- a/randr/rrcrtc.c
+++ b/randr/rrcrtc.c
@@ -382,11 +382,11 @@ rrDestroySharedPixmap(RRCrtcPtr crtc, PixmapPtr pPixmap) {
          */
         PixmapUnshareSecondaryPixmap(pPixmap);
 
-        dixDestroyPixmap(pPixmap->primary_pixmap, 0);
-        dixDestroyPixmap(pPixmap->primary_pixmap, 0);
+        primary->DestroyPixmap(pPixmap->primary_pixmap);
+        primary->DestroyPixmap(pPixmap->primary_pixmap);
     }
 
-    dixDestroyPixmap(pPixmap, 0);
+    crtc->pScreen->DestroyPixmap(pPixmap);
 }
 
 void
@@ -440,7 +440,7 @@ rrCreateSharedPixmap(RRCrtcPtr crtc, ScreenPtr primary,
 
     spix = PixmapShareToSecondary(mpix, crtc->pScreen);
     if (spix == NULL) {
-        dixDestroyPixmap(mpix, 0);
+        primary->DestroyPixmap(mpix);
         return NULL;
     }