diff --git a/menu/drivers/ozone/ozone.c b/menu/drivers/ozone/ozone.c
index 58796a8ce4..d735f18882 100644
--- a/menu/drivers/ozone/ozone.c
+++ b/menu/drivers/ozone/ozone.c
@@ -3108,6 +3108,7 @@ static void ozone_frame(void *data, video_frame_info_t *video_info)
    /* Draw fullscreen thumbnails, if required */
    ozone_draw_fullscreen_thumbnails(ozone,
          userdata,
+         video_info->disp_userdata,
          video_width,
          video_height);
 
@@ -3154,6 +3155,7 @@ static void ozone_frame(void *data, video_frame_info_t *video_info)
 
       ozone_draw_backdrop(
             userdata,
+            video_info->disp_userdata,
             video_width,
             video_height,
             float_min(ozone->animations.messagebox_alpha, 0.75f));
@@ -3165,6 +3167,7 @@ static void ozone_frame(void *data, video_frame_info_t *video_info)
 
          ozone_draw_osk(ozone,
                userdata,
+               video_info->disp_userdata,
                video_width,
                video_height,
                label, str);
diff --git a/menu/drivers/ozone/ozone_display.c b/menu/drivers/ozone/ozone_display.c
index 68cf4278d3..5f40e2505f 100644
--- a/menu/drivers/ozone/ozone_display.c
+++ b/menu/drivers/ozone/ozone_display.c
@@ -347,6 +347,7 @@ void ozone_draw_icon(
 
 void ozone_draw_backdrop(
       void *userdata,
+      void *disp_data,
       unsigned video_width,
       unsigned video_height,
       float alpha)
@@ -358,7 +359,6 @@ void ozone_draw_backdrop(
       0.00, 0.00, 0.00, 0.75,
    };
    static float last_alpha           = 0.0f;
-   gfx_display_t *p_disp             = disp_get_ptr();
 
    /* TODO: Replace this backdrop by a blur shader 
     * on the whole screen if available */
@@ -369,7 +369,7 @@ void ozone_draw_backdrop(
    }
 
    gfx_display_draw_quad(
-         p_disp,
+         (gfx_display_t*)disp_data,
          userdata,
          video_width,
          video_height,
@@ -384,13 +384,14 @@ void ozone_draw_backdrop(
 
 void ozone_draw_osk(ozone_handle_t *ozone,
       void *userdata,
+      void *disp_userdata,
       unsigned video_width,
       unsigned video_height,
       const char *label, const char *str)
 {
    unsigned i;
    char message[2048];
-   gfx_display_t *p_disp               = disp_get_ptr();
+   gfx_display_t *p_disp               = (gfx_display_t*)disp_userdata;
    const char *text                    = str;
    unsigned text_color                 = 0xffffffff;
    static float ozone_osk_backdrop[16] = {
@@ -703,22 +704,23 @@ void ozone_draw_messagebox(
 void ozone_draw_fullscreen_thumbnails(
       ozone_handle_t *ozone,
       void *userdata,
+      void *disp_userdata,
       unsigned video_width,
       unsigned video_height)
 {
-   gfx_display_t *p_disp = disp_get_ptr();
-
    /* Check whether fullscreen thumbnails are visible */
    if (ozone->animations.fullscreen_thumbnail_alpha > 0.0f)
    {
       /* Note: right thumbnail is drawn at the top
        * in the sidebar, so it becomes the *left*
        * thumbnail when viewed fullscreen */
-      gfx_thumbnail_t *right_thumbnail = &ozone->thumbnails.left;
-      gfx_thumbnail_t *left_thumbnail  = &ozone->thumbnails.right;
+      gfx_thumbnail_t *right_thumbnail  = &ozone->thumbnails.left;
+      gfx_thumbnail_t *left_thumbnail   = &ozone->thumbnails.right;
       unsigned width                    = video_width;
       unsigned height                   = video_height;
       int view_width                    = (int)width;
+      gfx_display_t *p_disp             = (gfx_display_t*)disp_userdata;
+
       int view_height                   = (int)height - ozone->dimensions.header_height - ozone->dimensions.footer_height - ozone->dimensions.spacer_1px;
       int thumbnail_margin              = ozone->dimensions.fullscreen_thumbnail_padding;
       bool show_right_thumbnail         = false;
diff --git a/menu/drivers/ozone/ozone_display.h b/menu/drivers/ozone/ozone_display.h
index 0e7e32e716..60e3e42c88 100644
--- a/menu/drivers/ozone/ozone_display.h
+++ b/menu/drivers/ozone/ozone_display.h
@@ -50,6 +50,7 @@ void ozone_restart_cursor_animation(ozone_handle_t *ozone);
 
 void ozone_draw_backdrop(
       void *userdata,
+      void *disp_data,
       unsigned video_width,
       unsigned video_height,
       float alpha);
@@ -57,6 +58,7 @@ void ozone_draw_backdrop(
 void ozone_draw_osk(
       ozone_handle_t *ozone,
       void *userdata,
+      void *disp_userdata,
       unsigned video_width,
       unsigned video_height,
       const char *label, const char *str);
@@ -72,6 +74,7 @@ void ozone_draw_messagebox(
 void ozone_draw_fullscreen_thumbnails(
       ozone_handle_t *ozone,
       void *userdata,
+      void *disp_userdata,
       unsigned video_width,
       unsigned video_height
       );