diff --git a/frontend/drivers/platform_switch.c b/frontend/drivers/platform_switch.c
index 08dd812bb9..1ad014c407 100644
--- a/frontend/drivers/platform_switch.c
+++ b/frontend/drivers/platform_switch.c
@@ -163,12 +163,7 @@ static void frontend_switch_deinit(void *data)
       splashData = NULL;
    }
 
-#ifdef HAVE_OPENGL
-   // Workaround for eglTerminate/re-init bug
-   egl_destroy(&nx_ctx_ptr->egl);
-   nx_ctx_ptr->resize = false;
-   free(nx_ctx_ptr);
-#else
+#ifndef HAVE_OPENGL
    gfxExit();
 #endif
 #endif
diff --git a/gfx/drivers_context/switch_ctx.c b/gfx/drivers_context/switch_ctx.c
index cb8ef1de52..739f0b2524 100644
--- a/gfx/drivers_context/switch_ctx.c
+++ b/gfx/drivers_context/switch_ctx.c
@@ -34,11 +34,10 @@ void switch_ctx_destroy(void *data)
     if (ctx_nx)
     {
 #ifdef HAVE_EGL
-        // Workaround for eglTerminate/re-init bug, other part in platform_switch.c
-        //egl_destroy(&ctx_nx->egl);
+        egl_destroy(&ctx_nx->egl);
 #endif
         ctx_nx->resize = false;
-        //free(ctx_nx);
+        free(ctx_nx);
     }
 }