diff --git a/gfx/gfx_animation.c b/gfx/gfx_animation.c
index 307384b866..1b20b4f4b5 100644
--- a/gfx/gfx_animation.c
+++ b/gfx/gfx_animation.c
@@ -1224,12 +1224,12 @@ void gfx_animation_unset_update_time_cb(void)
 }
 
 static void gfx_animation_update_time(
+      gfx_animation_t *p_anim,
       retro_time_t current_time,
       bool timedate_enable,
       unsigned video_width, unsigned video_height,
       float _ticker_speed)
 {
-   gfx_animation_t *p_anim                     = anim_get_ptr();
    const bool ticker_is_active                 = p_anim->ticker_is_active;
 
    static retro_time_t last_clock_update       = 0;
@@ -1345,6 +1345,7 @@ bool gfx_animation_update(
    gfx_animation_t *p_anim = anim_get_ptr();
 
    gfx_animation_update_time(
+         p_anim,
          current_time,
          timedate_enable,
          video_width, video_height,
diff --git a/retroarch.c b/retroarch.c
index 7a07dcadf1..63cc80b069 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -17258,7 +17258,7 @@ static bool rarch_environment_cb(unsigned cmd, void *data)
          RARCH_LOG("[Environ]: SET_MESSAGE: %s\n", msg->msg);
 #if defined(HAVE_GFX_WIDGETS)
          if (p_rarch->widgets_active)
-            gfx_widget_set_libretro_message(dispwidget_get_ptr(),
+            gfx_widget_set_libretro_message(&p_rarch->dispwidget_st,
                   msg->msg,
                   roundf((float)msg->frames / 60.0f * 1000.0f));
          else
@@ -17349,7 +17349,7 @@ static bool rarch_environment_cb(unsigned cmd, void *data)
                /* Handle 'alternate' non-queued notifications */
                case RETRO_MESSAGE_TYPE_NOTIFICATION_ALT:
                   if (p_rarch->widgets_active)
-                     gfx_widget_set_libretro_message(dispwidget_get_ptr(),
+                     gfx_widget_set_libretro_message(&p_rarch->dispwidget_st,
                            msg->msg, msg->duration);
                   else
                      runloop_core_msg_queue_push(p_rarch, msg);
@@ -17364,7 +17364,7 @@ static bool rarch_environment_cb(unsigned cmd, void *data)
                 * handle these correctly */
                case RETRO_MESSAGE_TYPE_PROGRESS:
                   if (p_rarch->widgets_active)
-                     gfx_widget_set_libretro_message(dispwidget_get_ptr(),
+                     gfx_widget_set_libretro_message(&p_rarch->dispwidget_st,
                            msg->msg, msg->duration);
                   else
                      runloop_core_msg_queue_push(p_rarch, msg);