diff --git a/epan/register.c b/epan/register.c
index cd6bf735c7..d8c0eda839 100644
--- a/epan/register.c
+++ b/epan/register.c
@@ -119,12 +119,12 @@ register_all_protocol_handoffs_worker(void *arg _U_)
 void
 register_all_protocol_handoffs(register_cb cb, gpointer cb_data)
 {
-    cur_cb_name = NULL;
     const char *cb_name;
     gboolean called_back = FALSE;
     GThread *raphw_thread;
     const char *error_message;
 
+    set_cb_name(NULL);
     raphw_thread = g_thread_new("register_all_protocol_handoffs_worker", &register_all_protocol_handoffs_worker, NULL);
     while (!g_async_queue_timeout_pop(register_cb_done_q, CB_WAIT_TIME)) {
         g_mutex_lock(&cur_cb_name_mtx);