diff --git a/gfx/drivers_context/android_ctx.c b/gfx/drivers_context/android_ctx.c
index f1122e816e..0b6b862af4 100644
--- a/gfx/drivers_context/android_ctx.c
+++ b/gfx/drivers_context/android_ctx.c
@@ -520,7 +520,6 @@ static void android_gfx_ctx_swap_buffers(void *data)
    {
       case GFX_CTX_OPENGL_API:
       case GFX_CTX_OPENGL_ES_API:
-      case GFX_CTX_OPENVG_API:
 #ifdef HAVE_EGL
          egl_swap_buffers(&and->egl);
 #endif
diff --git a/gfx/drivers_context/khr_display_ctx.c b/gfx/drivers_context/khr_display_ctx.c
index a4eb20b94b..b9853a4184 100644
--- a/gfx/drivers_context/khr_display_ctx.c
+++ b/gfx/drivers_context/khr_display_ctx.c
@@ -33,8 +33,6 @@ typedef struct
    unsigned height;
 } khr_display_ctx_data_t;
 
-static enum gfx_ctx_api khr_api = GFX_CTX_NONE;
-
 static void gfx_ctx_khr_display_destroy(void *data)
 {
    khr_display_ctx_data_t *khr = (khr_display_ctx_data_t*)data;
@@ -198,14 +196,12 @@ static void gfx_ctx_khr_display_input_driver(void *data,
 
 static enum gfx_ctx_api gfx_ctx_khr_display_get_api(void *data)
 {
-   return khr_api;
+   return GFX_CTX_VULKAN_API;
 }
 
 static bool gfx_ctx_khr_display_bind_api(void *data,
       enum gfx_ctx_api api, unsigned major, unsigned minor)
 {
-   khr_api     = api;
-
    if (api == GFX_CTX_VULKAN_API)
       return true;