diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c
index 32e7c6056dd..aee2872d70d 100644
--- a/src/glx/dri2_glx.c
+++ b/src/glx/dri2_glx.c
@@ -890,14 +890,10 @@ dri2BindExtensions(struct dri2_screen *psc, struct glx_display * priv,
       if (strcmp(extensions[i]->name, __DRI2_ROBUSTNESS) == 0)
          __glXEnableDirectExtension(&psc->base,
                                     "GLX_ARB_create_context_robustness");
-
-      if (strcmp(extensions[i]->name, __DRI2_FLUSH_CONTROL) == 0)
-         __glXEnableDirectExtension(&psc->base,
-                                    "GLX_ARB_context_flush_control");
    }
 
    __glXEnableDirectExtension(&psc->base, "GLX_EXT_texture_from_pixmap");
-
+   __glXEnableDirectExtension(&psc->base, "GLX_ARB_context_flush_control");
    __glXEnableDirectExtension(&psc->base, "GLX_MESA_query_renderer");
 
    if (psc->interop)
diff --git a/src/glx/dri3_glx.c b/src/glx/dri3_glx.c
index 386de68a188..6402dfac6d2 100644
--- a/src/glx/dri3_glx.c
+++ b/src/glx/dri3_glx.c
@@ -720,12 +720,9 @@ dri3_bind_extensions(struct dri3_screen *psc, struct glx_display * priv,
       if (strcmp(extensions[i]->name, __DRI2_ROBUSTNESS) == 0)
          __glXEnableDirectExtension(&psc->base,
                                     "GLX_ARB_create_context_robustness");
-
-      if (strcmp(extensions[i]->name, __DRI2_FLUSH_CONTROL) == 0)
-         __glXEnableDirectExtension(&psc->base,
-                                    "GLX_ARB_context_flush_control");
    }
 
+   __glXEnableDirectExtension(&psc->base, "GLX_ARB_context_flush_control");
    __glXEnableDirectExtension(&psc->base, "GLX_MESA_query_renderer");
 
    if (psc->interop)
diff --git a/src/glx/drisw_glx.c b/src/glx/drisw_glx.c
index 05348f60994..d1fcb45ecef 100644
--- a/src/glx/drisw_glx.c
+++ b/src/glx/drisw_glx.c
@@ -805,15 +805,10 @@ driswBindExtensions(struct drisw_screen *psc, const __DRIextension **extensions)
       if (strcmp(extensions[i]->name, __DRI2_ROBUSTNESS) == 0)
          __glXEnableDirectExtension(&psc->base,
                                     "GLX_ARB_create_context_robustness");
-
-      if (strcmp(extensions[i]->name, __DRI2_FLUSH_CONTROL) == 0) {
-          __glXEnableDirectExtension(&psc->base,
-                                     "GLX_ARB_context_flush_control");
-      }
    }
 
    __glXEnableDirectExtension(&psc->base, "GLX_EXT_texture_from_pixmap");
-
+   __glXEnableDirectExtension(&psc->base, "GLX_ARB_context_flush_control");
    __glXEnableDirectExtension(&psc->base, "GLX_MESA_query_renderer");
 
    if (psc->kopper) {