diff --git a/src/dispatch_common.c b/src/dispatch_common.c
index 62b7134..9977a02 100644
--- a/src/dispatch_common.c
+++ b/src/dispatch_common.c
@@ -674,13 +674,9 @@ epoxy_load_gl(void)
     if (!api.gl_handle)
 	get_dlopen_handle(&api.gl_handle, OPENGL_LIB, false, true);
 #endif
-    if (!api.gl_handle) {
-	get_dlopen_handle(&api.gl_handle, GLX_LIB, true, true);
-#if PLATFORM_HAS_GLX
-        if (!api.glx_handle)
-	    api.glx_handle = api.gl_handle;
-#endif
-    }
+
+    get_dlopen_handle(&api.glx_handle, GLX_LIB, true, true);
+    api.gl_handle = api.glx_handle;
 #endif
 }