diff --git a/glucose/glucose.c b/glucose/glucose.c
index 076bb7e54..e3fe990d5 100644
--- a/glucose/glucose.c
+++ b/glucose/glucose.c
@@ -122,6 +122,8 @@ glucoseCreateScreenResources(ScreenPtr pScreen)
     PixmapPtr pPixmap = pScreen->GetScreenPixmap(pScreen);
     xglScreenPtr xglScreenPriv = XGL_GET_SCREEN_PRIV (pScreen);
 
+    __pGlxClient = serverClient;
+    
     /* track root pixmap */
     if (pPixmap)
     {
@@ -750,6 +752,8 @@ glucoseCloseScreen (int	  index,
     {
     	GlucoseScreenPrivPtr pScreenPriv = GlucoseGetScreenPriv(pScreen);
 
+        __pGlxClient = serverClient;        
+
     	pScreenPriv->rootContext->destroy(pScreenPriv->rootContext);
     	pScreenPriv->rootDrawable->destroy(pScreenPriv->rootDrawable);