diff --git a/glx/glxcmds.c b/glx/glxcmds.c
index 2f69c794a..3f1bb9a71 100644
--- a/glx/glxcmds.c
+++ b/glx/glxcmds.c
@@ -664,9 +664,10 @@ xorgGlxMakeCurrent(ClientPtr client, GLXContextTag tag, XID drawId, XID readId,
         }
 
         glxc->currentClient = client;
-        glxServer.setContextTagPrivate(client, newContextTag, glxc);
     }
 
+    glxServer.setContextTagPrivate(client, newContextTag, glxc);
+
     if (prevglxc) {
         prevglxc->currentClient = NULL;
         if (!prevglxc->idExists) {