diff --git a/menu/drivers/rgui.c b/menu/drivers/rgui.c
index 60653902ee..210ac1dcc3 100644
--- a/menu/drivers/rgui.c
+++ b/menu/drivers/rgui.c
@@ -494,7 +494,7 @@ static void rgui_render(void)
 
    if (menu->msg_force)
    {
-      message_queue = msg_queue_pull(g_runloop.msg_queue);
+      message_queue = rarch_main_msg_queue_pull();
       menu->msg_force = false;
    }
    else
diff --git a/menu/drivers/rmenu_xui.cpp b/menu/drivers/rmenu_xui.cpp
index f8e4a46756..c5aa835ed7 100644
--- a/menu/drivers/rmenu_xui.cpp
+++ b/menu/drivers/rmenu_xui.cpp
@@ -455,13 +455,13 @@ static void rmenu_xui_frame(void)
 
    XuiRenderSetViewTransform( app.GetDC(), &matOrigView );
 
-   const char *message = msg_queue_pull(xui_msg_queue);
+   const char *message = rarch_main_msg_queue_pull();
 
    if (message)
       xui_render_message(message);
    else
    {
-      const char *message = msg_queue_pull(g_runloop.msg_queue);
+      const char *message = rarch_main_msg_queue_pull();
       if (message)
          xui_render_message(message);
    }