diff --git a/ext/eglgles/gstegladaptation_eagl.m b/ext/eglgles/gstegladaptation_eagl.m
index 8802c05599..2da420308a 100644
--- a/ext/eglgles/gstegladaptation_eagl.m
+++ b/ext/eglgles/gstegladaptation_eagl.m
@@ -299,6 +299,12 @@ gst_egl_adaptation_destroy_surface (GstEglAdaptationContext * ctx)
   if (ctx->eaglctx->framebuffer) {
     glDeleteFramebuffers (1, &ctx->eaglctx->framebuffer);
     ctx->eaglctx->framebuffer = 0;
+
+    glDeleteRenderbuffers(1, &ctx->eaglctx->depth_renderbuffer);
+    ctx->eaglctx->depth_renderbuffer = 0;
+    glDeleteRenderbuffers(1, &ctx->eaglctx->color_renderbuffer);
+    ctx->eaglctx->color_renderbuffer = 0;
+
     ctx->have_surface = FALSE;
   }
 }
@@ -324,8 +330,7 @@ void
 gst_egl_adaptation_destroy_context (GstEglAdaptationContext * ctx)
 {
   if (ctx->eaglctx->eagl_context) {
-    /* Do not release/dealloc as it seems that EAGL expects to do all
-     * the cleanup by itself when a new context replaces the old one */
+    [ctx->eaglctx->eagl_context release];
     ctx->eaglctx->eagl_context = NULL;
   }
 }