diff --git a/database_info.c b/database_info.c
index b332d586f5..1a0abde7dc 100644
--- a/database_info.c
+++ b/database_info.c
@@ -80,8 +80,12 @@ void database_info_write_rdl_free(database_info_rdl_handle_t *dbl)
 {
    if (!dbl)
       return;
+
    string_list_free(dbl->list);
    free(dbl);
+
+   msg_queue_clear(g_runloop.msg_queue);
+   msg_queue_push(g_runloop.msg_queue, "Scanning of directory finished.\n", 1, 180);
 }
 
 int database_info_write_rdl_iterate(database_info_rdl_handle_t *dbl)
diff --git a/runloop_data.c b/runloop_data.c
index 0ce3aac90b..80738d8d83 100644
--- a/runloop_data.c
+++ b/runloop_data.c
@@ -531,9 +531,6 @@ static void rarch_main_data_rdl_iterate(void)
 #ifdef HAVE_LIBRETRODB
    if (!driver.menu->rdl->iterating)
    {
-      msg_queue_clear(g_runloop.msg_queue);
-      msg_queue_push(g_runloop.msg_queue, "Scanning of directory finished.\n", 1, 180);
-
       database_info_write_rdl_free(driver.menu->rdl);
       driver.menu->rdl = NULL;
       return;