diff --git a/server/thread.c b/server/thread.c
index a3a35724432..a3ba2ae25e9 100644
--- a/server/thread.c
+++ b/server/thread.c
@@ -147,6 +147,7 @@ inline static void init_thread_structure( struct thread *thread )
     thread->creation_time   = time(NULL);
     thread->exit_time       = 0;
     thread->desktop_users   = 0;
+    thread->token           = NULL;
 
     list_init( &thread->mutex_list );
     list_init( &thread->system_apc );
@@ -188,8 +189,6 @@ struct thread *create_thread( int fd, struct process *process )
         return NULL;
     }
 
-    thread->token = (struct token *) grab_object( process->token );
-
     set_fd_events( thread->request_fd, POLLIN );  /* start listening to events */
     add_process_thread( thread->process, thread );
     return thread;