diff --git a/backend/drm/renderer.c b/backend/drm/renderer.c
index f2d7677c01..98a0913501 100644
--- a/backend/drm/renderer.c
+++ b/backend/drm/renderer.c
@@ -8,7 +8,6 @@
 #include <string.h>
 #include <unistd.h>
 #include <wayland-util.h>
-#include <wlr/render/gles2.h>
 #include <wlr/render/wlr_renderer.h>
 #include <wlr/types/wlr_matrix.h>
 #include <wlr/util/log.h>
@@ -115,10 +114,6 @@ bool drm_surface_make_current(struct wlr_drm_surface *surf,
 		return false;
 	}
 
-	struct wlr_egl *egl = wlr_gles2_renderer_get_egl(surf->renderer->wlr_rend);
-	if (!wlr_egl_make_current(egl)) {
-		return false;
-	}
 	if (!wlr_renderer_bind_buffer(surf->renderer->wlr_rend, surf->back_buffer)) {
 		wlr_log(WLR_ERROR, "Failed to attach buffer to renderer");
 		return false;
@@ -129,10 +124,8 @@ bool drm_surface_make_current(struct wlr_drm_surface *surf,
 
 void drm_surface_unset_current(struct wlr_drm_surface *surf) {
 	assert(surf->back_buffer != NULL);
-	struct wlr_egl *egl = wlr_gles2_renderer_get_egl(surf->renderer->wlr_rend);
 
 	wlr_renderer_bind_buffer(surf->renderer->wlr_rend, NULL);
-	wlr_egl_unset_current(egl);
 
 	wlr_buffer_unlock(surf->back_buffer);
 	surf->back_buffer = NULL;
diff --git a/backend/headless/output.c b/backend/headless/output.c
index 0ffdee797a..abd1ac456f 100644
--- a/backend/headless/output.c
+++ b/backend/headless/output.c
@@ -2,7 +2,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <wlr/interfaces/wlr_output.h>
-#include <wlr/render/gles2.h>
 #include <wlr/render/wlr_renderer.h>
 #include <wlr/util/log.h>
 #include "backend/headless.h"
@@ -43,8 +42,6 @@ static bool output_attach_render(struct wlr_output *wlr_output,
 		int *buffer_age) {
 	struct wlr_headless_output *output =
 		headless_output_from_output(wlr_output);
-	struct wlr_egl *egl = wlr_gles2_renderer_get_egl(
-			output->backend->renderer);
 
 	wlr_buffer_unlock(output->back_buffer);
 	output->back_buffer = wlr_swapchain_acquire(output->swapchain, buffer_age);
@@ -52,9 +49,6 @@ static bool output_attach_render(struct wlr_output *wlr_output,
 		return false;
 	}
 
-	if (!wlr_egl_make_current(egl)) {
-		return false;
-	}
 	if (!wlr_renderer_bind_buffer(output->backend->renderer,
 			output->back_buffer)) {
 		return false;
@@ -101,10 +95,6 @@ static bool output_commit(struct wlr_output *wlr_output) {
 
 			wlr_renderer_bind_buffer(output->backend->renderer, NULL);
 
-			struct wlr_egl *egl = wlr_gles2_renderer_get_egl(
-					output->backend->renderer);
-			wlr_egl_unset_current(egl);
-
 			buffer = output->back_buffer;
 			output->back_buffer = NULL;
 			break;
@@ -128,12 +118,8 @@ static bool output_commit(struct wlr_output *wlr_output) {
 static void output_rollback_render(struct wlr_output *wlr_output) {
 	struct wlr_headless_output *output =
 		headless_output_from_output(wlr_output);
-	struct wlr_egl *egl = wlr_gles2_renderer_get_egl(
-			output->backend->renderer);
-	assert(wlr_egl_is_current(egl));
 
 	wlr_renderer_bind_buffer(output->backend->renderer, NULL);
-	wlr_egl_unset_current(egl);
 
 	wlr_buffer_unlock(output->back_buffer);
 	output->back_buffer = NULL;
diff --git a/backend/wayland/output.c b/backend/wayland/output.c
index 3abf2b5e7e..e9353aa383 100644
--- a/backend/wayland/output.c
+++ b/backend/wayland/output.c
@@ -10,7 +10,6 @@
 #include <wayland-client.h>
 
 #include <wlr/interfaces/wlr_output.h>
-#include <wlr/render/gles2.h>
 #include <wlr/render/wlr_renderer.h>
 #include <wlr/types/wlr_matrix.h>
 #include <wlr/util/log.h>
@@ -116,8 +115,6 @@ static bool output_set_custom_mode(struct wlr_output *wlr_output,
 static bool output_attach_render(struct wlr_output *wlr_output,
 		int *buffer_age) {
 	struct wlr_wl_output *output = get_wl_output_from_output(wlr_output);
-	struct wlr_egl *egl = wlr_gles2_renderer_get_egl(
-			output->backend->renderer);
 
 	wlr_buffer_unlock(output->back_buffer);
 	output->back_buffer = wlr_swapchain_acquire(output->swapchain, buffer_age);
@@ -125,9 +122,6 @@ static bool output_attach_render(struct wlr_output *wlr_output,
 		return false;
 	}
 
-	if (!wlr_egl_make_current(egl)) {
-		return false;
-	}
 	if (!wlr_renderer_bind_buffer(output->backend->renderer,
 			output->back_buffer)) {
 		return false;
@@ -312,10 +306,6 @@ static bool output_commit(struct wlr_output *wlr_output) {
 			wlr_buffer = output->back_buffer;
 
 			wlr_renderer_bind_buffer(output->backend->renderer, NULL);
-
-			struct wlr_egl *egl = wlr_gles2_renderer_get_egl(
-					output->backend->renderer);
-			wlr_egl_unset_current(egl);
 			break;
 		case WLR_OUTPUT_STATE_BUFFER_SCANOUT:;
 			wlr_buffer = wlr_output->pending.buffer;
@@ -375,10 +365,7 @@ static bool output_commit(struct wlr_output *wlr_output) {
 
 static void output_rollback_render(struct wlr_output *wlr_output) {
 	struct wlr_wl_output *output = get_wl_output_from_output(wlr_output);
-	struct wlr_egl *egl = wlr_gles2_renderer_get_egl(
-			output->backend->renderer);
 	wlr_renderer_bind_buffer(output->backend->renderer, NULL);
-	wlr_egl_unset_current(egl);
 }
 
 static bool output_set_cursor(struct wlr_output *wlr_output,
@@ -410,8 +397,6 @@ static bool output_set_cursor(struct wlr_output *wlr_output,
 	struct wl_surface *surface = output->cursor.surface;
 
 	if (texture != NULL) {
-		struct wlr_egl *egl = wlr_gles2_renderer_get_egl(
-				output->backend->renderer);
 		int width = texture->width * wlr_output->scale / scale;
 		int height = texture->height * wlr_output->scale / scale;
 
@@ -433,9 +418,6 @@ static bool output_set_cursor(struct wlr_output *wlr_output,
 			return false;
 		}
 
-		if (!wlr_egl_make_current(egl)) {
-			return false;
-		}
 		if (!wlr_renderer_bind_buffer(output->backend->renderer, wlr_buffer)) {
 			return false;
 		}
@@ -457,7 +439,6 @@ static bool output_set_cursor(struct wlr_output *wlr_output,
 		wlr_renderer_end(backend->renderer);
 
 		wlr_renderer_bind_buffer(output->backend->renderer, NULL);
-		wlr_egl_unset_current(egl);
 
 		struct wlr_wl_buffer *buffer =
 			get_or_create_wl_buffer(output->backend, wlr_buffer);
diff --git a/backend/x11/output.c b/backend/x11/output.c
index 11dda67d67..4f91a55f77 100644
--- a/backend/x11/output.c
+++ b/backend/x11/output.c
@@ -13,7 +13,6 @@
 #include <wlr/interfaces/wlr_output.h>
 #include <wlr/interfaces/wlr_pointer.h>
 #include <wlr/interfaces/wlr_touch.h>
-#include <wlr/render/gles2.h>
 #include <wlr/util/log.h>
 
 #include "backend/x11.h"
@@ -98,7 +97,6 @@ static bool output_attach_render(struct wlr_output *wlr_output,
 		int *buffer_age) {
 	struct wlr_x11_output *output = get_x11_output_from_output(wlr_output);
 	struct wlr_x11_backend *x11 = output->x11;
-	struct wlr_egl *egl = wlr_gles2_renderer_get_egl(x11->renderer);
 
 	wlr_buffer_unlock(output->back_buffer);
 	output->back_buffer = wlr_swapchain_acquire(output->swapchain, buffer_age);
@@ -106,9 +104,6 @@ static bool output_attach_render(struct wlr_output *wlr_output,
 		return false;
 	}
 
-	if (!wlr_egl_make_current(egl)) {
-		return false;
-	}
 	if (!wlr_renderer_bind_buffer(x11->renderer, output->back_buffer)) {
 		return false;
 	}
@@ -206,12 +201,10 @@ static struct wlr_x11_buffer *get_or_create_x11_buffer(
 
 static bool output_commit_buffer(struct wlr_x11_output *output) {
 	struct wlr_x11_backend *x11 = output->x11;
-	struct wlr_egl *egl = wlr_gles2_renderer_get_egl(x11->renderer);
 
 	assert(output->back_buffer != NULL);
 
 	wlr_renderer_bind_buffer(x11->renderer, NULL);
-	wlr_egl_unset_current(egl);
 
 	struct wlr_x11_buffer *x11_buffer =
 		get_or_create_x11_buffer(output, output->back_buffer);
@@ -318,10 +311,8 @@ static bool output_commit(struct wlr_output *wlr_output) {
 static void output_rollback_render(struct wlr_output *wlr_output) {
 	struct wlr_x11_output *output = get_x11_output_from_output(wlr_output);
 	struct wlr_x11_backend *x11 = output->x11;
-	struct wlr_egl *egl = wlr_gles2_renderer_get_egl(x11->renderer);
 
 	wlr_renderer_bind_buffer(x11->renderer, NULL);
-	wlr_egl_unset_current(egl);
 }
 
 static const struct wlr_output_impl output_impl = {
diff --git a/render/gles2/renderer.c b/render/gles2/renderer.c
index 8e7c37a860..59d46a9146 100644
--- a/render/gles2/renderer.c
+++ b/render/gles2/renderer.c
@@ -139,10 +139,11 @@ static struct wlr_gles2_buffer *create_buffer(struct wlr_gles2_renderer *rendere
 
 static bool gles2_bind_buffer(struct wlr_renderer *wlr_renderer,
 		struct wlr_buffer *wlr_buffer) {
-	struct wlr_gles2_renderer *renderer =
-		gles2_get_renderer_in_context(wlr_renderer);
+	struct wlr_gles2_renderer *renderer = gles2_get_renderer(wlr_renderer);
 
 	if (renderer->current_buffer != NULL) {
+		assert(wlr_egl_is_current(renderer->egl));
+
 		push_gles2_debug(renderer);
 		glFlush();
 		glBindFramebuffer(GL_FRAMEBUFFER, 0);
@@ -153,9 +154,12 @@ static bool gles2_bind_buffer(struct wlr_renderer *wlr_renderer,
 	}
 
 	if (wlr_buffer == NULL) {
+		wlr_egl_unset_current(renderer->egl);
 		return true;
 	}
 
+	wlr_egl_make_current(renderer->egl);
+
 	struct wlr_gles2_buffer *buffer = get_buffer(renderer, wlr_buffer);
 	if (buffer == NULL) {
 		buffer = create_buffer(renderer, wlr_buffer);