diff --git a/compositor/compositor-x11.c b/compositor/compositor-x11.c
index 18cb6558..df9329f5 100644
--- a/compositor/compositor-x11.c
+++ b/compositor/compositor-x11.c
@@ -436,7 +436,8 @@ x11_compositor_create_output(struct x11_compositor *c, int width, int height)
 	attribs[3] = reply->height;
 	attribs[5] = buffers[0].pitch / 4;
 	output->image =
-		eglCreateImageKHR(c->base.display, c->base.context,
+		eglCreateImageKHR(c->base.display,
+				  EGL_NO_CONTEXT,
 				  EGL_DRM_BUFFER_MESA,
 				  (EGLClientBuffer) buffers[0].name,
 				  attribs);
diff --git a/compositor/drm.c b/compositor/drm.c
index d0eab292..dd5788b8 100644
--- a/compositor/drm.c
+++ b/compositor/drm.c
@@ -137,7 +137,7 @@ drm_create_buffer(struct wl_client *client, struct wl_drm *drm_base,
 	attribs[3] = height;
 	attribs[5] = stride / 4;
 	image = eglCreateImageKHR(compositor->display,
-				  compositor->context,
+				  EGL_NO_CONTEXT,
 				  EGL_DRM_BUFFER_MESA,
 				  (EGLClientBuffer) name, attribs);
 	if (image == NULL) {