diff --git a/glx/glxcmds.c b/glx/glxcmds.c
index d148c79bf..c82ce2c78 100644
--- a/glx/glxcmds.c
+++ b/glx/glxcmds.c
@@ -648,11 +648,11 @@ xorgGlxMakeCurrent(ClientPtr client, GLXContextTag tag, XID drawId, XID readId,
             glxc->readPriv = NULL;
             return __glXError(GLXBadContext);
         }
-
-        glxc->currentClient = client;
     }
 
     glxServer.setContextTagPrivate(client, newContextTag, glxc);
+    if (glxc)
+        glxc->currentClient = client;
 
     if (prevglxc) {
         prevglxc->currentClient = NULL;