diff --git a/.pick_status.json b/.pick_status.json
index 8251f5bbef9..56b92aef697 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2353,7 +2353,7 @@
         "description": "glx: proposed fix for setSwapInterval",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "60ebeb4608a871ba89ba081c1c6e7ebdd5efec9a"
     },
diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c
index fcd82bab4a4..d7875bf8c9e 100644
--- a/src/glx/glxcmds.c
+++ b/src/glx/glxcmds.c
@@ -1863,8 +1863,8 @@ glXSwapIntervalEXT(Display *dpy, GLXDrawable drawable, int interval)
       __glXSendError(dpy, BadValue, interval, 0, True);
       return;
    }
-
-   pdraw->psc->driScreen->setSwapInterval(pdraw, interval);
+   if (pdraw->psc->driScreen->setSwapInterval)
+      pdraw->psc->driScreen->setSwapInterval(pdraw, interval);
 #endif
 }