diff --git a/common/headless_view.cpp b/common/headless_view.cpp
index f771be302..f790d90ce 100644
--- a/common/headless_view.cpp
+++ b/common/headless_view.cpp
@@ -153,6 +153,7 @@ HeadlessView::~HeadlessView() {
 #endif
 
 #if MBGL_USE_GLX
+    glXMakeCurrent(x_display, None, NULL);
     glXDestroyContext(x_display, gl_context);
     XFree(x_info);
     XCloseDisplay(x_display);