diff --git a/lib/thread/thread.c b/lib/thread/thread.c
index c66281bd0..ba367cd65 100644
--- a/lib/thread/thread.c
+++ b/lib/thread/thread.c
@@ -786,7 +786,6 @@ spdk_for_each_thread(spdk_msg_fn fn, void *ctx, spdk_msg_fn cpl)
 	ct->ctx = ctx;
 	ct->cpl = cpl;
 
-	pthread_mutex_lock(&g_devlist_mutex);
 	thread = _get_thread();
 	if (!thread) {
 		SPDK_ERRLOG("No thread allocated\n");
@@ -795,6 +794,8 @@ spdk_for_each_thread(spdk_msg_fn fn, void *ctx, spdk_msg_fn cpl)
 		return;
 	}
 	ct->orig_thread = thread;
+
+	pthread_mutex_lock(&g_devlist_mutex);
 	ct->cur_thread = TAILQ_FIRST(&g_threads);
 	pthread_mutex_unlock(&g_devlist_mutex);