diff --git a/gfx/drivers/vita2d_gfx.c b/gfx/drivers/vita2d_gfx.c
index cd0317a0aa..11bb3a2154 100644
--- a/gfx/drivers/vita2d_gfx.c
+++ b/gfx/drivers/vita2d_gfx.c
@@ -178,6 +178,7 @@ static bool vita2d_gfx_frame(void *data, const void *frame,
 
          if ((width != vita->width || height != vita->height) && vita->texture)
          {
+            vita2d_wait_rendering_done();
             vita2d_free_texture(vita->texture);
             vita->texture = NULL;
          }
@@ -646,6 +647,7 @@ static void vita_set_texture_frame(void *data, const void *frame, bool rgb32,
 
    if (width != vita->menu.width && height != vita->menu.height && vita->menu.texture)
    {
+      vita2d_wait_rendering_done();
       vita2d_free_texture(vita->menu.texture);
       vita->menu.texture = NULL;
    }
diff --git a/gfx/drivers_font/vita2d_font.c b/gfx/drivers_font/vita2d_font.c
index b1db41edda..cda53b2291 100644
--- a/gfx/drivers_font/vita2d_font.c
+++ b/gfx/drivers_font/vita2d_font.c
@@ -100,9 +100,7 @@ static void vita2d_font_free_font(void *data, bool is_threaded)
    if (font->font_driver && font->font_data)
       font->font_driver->free(font->font_data);
 
-#if 0
    vita2d_wait_rendering_done();
-#endif
    vita2d_free_texture(font->texture);
 
    free(font);