diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index ce94266d38..40836afd1d 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -286,8 +286,7 @@ static void *xmb_list_get_entry(void *data, menu_list_type_t type, unsigned i)
 {
    void *ptr               = NULL;
    size_t list_size        = 0;
-   menu_handle_t *menu     = (menu_handle_t*)data;
-   xmb_handle_t *xmb       = menu ? (xmb_handle_t*)menu->userdata : NULL;
+   xmb_handle_t *xmb       = (xmb_handle_t*)data;
    file_list_t *menu_stack = menu_entries_get_menu_stack_ptr(0);
 
    switch (type)
diff --git a/menu/menu_driver.c b/menu/menu_driver.c
index df3c968ece..4dc08bdf27 100644
--- a/menu/menu_driver.c
+++ b/menu/menu_driver.c
@@ -237,7 +237,9 @@ void *menu_driver_list_get_entry(menu_list_type_t type, unsigned i)
    const menu_ctx_driver_t *driver = menu_ctx_driver_get_ptr();
 
    if (driver && driver->list_get_entry)
-      return driver->list_get_entry(menu_driver_data, type, i);
+      return driver->list_get_entry(
+            menu_driver_data ? menu_driver_data->userdata : NULL,
+            type, i);
    return NULL;
 }