diff --git a/src/socketworks.c b/src/socketworks.c
index 5a9a836639..287892c2ed 100644
--- a/src/socketworks.c
+++ b/src/socketworks.c
@@ -702,16 +702,15 @@ void *select_and_execute(void *arg) {
         return NULL;
     }
 
+    tid = get_tid();
     memset(thread_info[thread_index].thread_name, 0,
            sizeof(thread_info[thread_index].thread_name));
     if (arg) {
         safe_strncpy(thread_info[thread_index].thread_name, (char *)arg);
+        pthread_setname_np(tid, thread_info[thread_index].thread_name);
     } else
         strcpy(thread_info[thread_index].thread_name, "main");
 
-    tid = get_tid();
-    pthread_setname_np(tid, thread_info[thread_index].thread_name);
-
     select_timeout = SELECT_TIMEOUT;
     thread_info[thread_index].tid = tid;
     les = 1;