diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c
index fcd82bab4a4..7882d606554 100644
--- a/src/glx/glxcmds.c
+++ b/src/glx/glxcmds.c
@@ -1888,6 +1888,9 @@ glXGetVideoSyncSGI(unsigned int *count)
    if (!gc->isDirect)
       return GLX_BAD_CONTEXT;
 
+   if (!gc->currentDrawable)
+      return GLX_BAD_CONTEXT;
+
    psc = GetGLXScreenConfigs(gc->currentDpy, gc->screen);
    pdraw = GetGLXDRIDrawable(gc->currentDpy, gc->currentDrawable);
 
@@ -1926,6 +1929,9 @@ glXWaitVideoSyncSGI(int divisor, int remainder, unsigned int *count)
    if (!gc->isDirect)
       return GLX_BAD_CONTEXT;
 
+   if (!gc->currentDrawable)
+      return GLX_BAD_CONTEXT;
+
    psc = GetGLXScreenConfigs( gc->currentDpy, gc->screen);
    pdraw = GetGLXDRIDrawable(gc->currentDpy, gc->currentDrawable);