diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index 2c9606d00a..8569543a52 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -2865,9 +2865,6 @@ static void *xmb_init(void **userdata)
    menu_display_allocate_white_texture();
 
    xmb_init_horizontal_list(xmb);
-   /* FIXME: remove this? */
-   xmb->font = menu_display_font(APPLICATION_SPECIAL_DIRECTORY_ASSETS_XMB_FONT, xmb->font_size);
-   xmb->font2 = menu_display_font(APPLICATION_SPECIAL_DIRECTORY_ASSETS_XMB_FONT, xmb->font2_size);
    xmb_init_ribbon(xmb);
 
    return menu;
@@ -3428,6 +3425,9 @@ static void xmb_context_destroy(void *data)
 
    menu_display_font_free(xmb->font);
    menu_display_font_free(xmb->font2);
+
+   xmb->font = NULL;
+   xmb->font2 = NULL;
 }
 
 static void xmb_toggle(void *userdata, bool menu_on)