diff --git a/common/headless_view.cpp b/common/headless_view.cpp
index 9fa75700a..ff903939b 100644
--- a/common/headless_view.cpp
+++ b/common/headless_view.cpp
@@ -148,14 +148,11 @@ void HeadlessView::clear_buffers() {
 }
 
 HeadlessView::~HeadlessView() {
-    clear_buffers();
-
 #if MBGL_USE_CGL
     CGLDestroyContext(gl_context);
 #endif
 
 #if MBGL_USE_GLX
-    glXMakeCurrent(x_display, None, NULL);
     glXDestroyContext(x_display, gl_context);
     XFree(x_info);
     XCloseDisplay(x_display);