diff --git a/.pick_status.json b/.pick_status.json
index 8f0f99313c2..234d98e5944 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2794,7 +2794,7 @@
         "description": "glx: set the loader_logger early and for everyone",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "d971a4230d54069c996bca78b6ed6a6a23377821"
     },
diff --git a/src/glx/dri3_glx.c b/src/glx/dri3_glx.c
index a5cf0e3bf32..813a49b48ab 100644
--- a/src/glx/dri3_glx.c
+++ b/src/glx/dri3_glx.c
@@ -1105,8 +1105,6 @@ dri3_create_display(Display * dpy)
    pdp->base.destroyDisplay = dri3_destroy_display;
    pdp->base.createScreen = dri3_create_screen;
 
-   loader_set_logger(dri_message);
-
    pdp->loader_extensions = loader_extensions;
 
    return &pdp->base;
diff --git a/src/glx/glxext.c b/src/glx/glxext.c
index 59434431006..cbc59e80921 100644
--- a/src/glx/glxext.c
+++ b/src/glx/glxext.c
@@ -50,6 +50,7 @@
 #include "glxextensions.h"
 
 #include "util/debug.h"
+#include "dri_common.h"
 
 #include <X11/Xlib-xcb.h>
 #include <xcb/xcb.h>
@@ -907,6 +908,9 @@ __glXInitialize(Display * dpy)
 
    dpyPriv->drawHash = __glxHashCreate();
 
+   /* Set the logger before the *CreateDisplay functions. */
+   loader_set_logger(dri_message);
+
    /*
     ** Initialize the direct rendering per display data and functions.
     ** Note: This _must_ be done before calling any other DRI routines