diff --git a/libweston/gl-renderer.c b/libweston/gl-renderer.c
index d08bfd0d..c6091af0 100644
--- a/libweston/gl-renderer.c
+++ b/libweston/gl-renderer.c
@@ -2760,6 +2760,10 @@ gl_renderer_output_destroy(struct weston_output *output)
 	for (i = 0; i < 2; i++)
 		pixman_region32_fini(&go->buffer_damage[i]);
 
+	eglMakeCurrent(gr->egl_display,
+		       EGL_NO_SURFACE, EGL_NO_SURFACE,
+		       EGL_NO_CONTEXT);
+
 	weston_platform_destroy_egl_surface(gr->egl_display, go->egl_surface);
 
 	free(go);