diff --git a/src/gallium/auxiliary/util/u_threaded_context.c b/src/gallium/auxiliary/util/u_threaded_context.c
index c0a434c2c3b..2344ccfd6e5 100644
--- a/src/gallium/auxiliary/util/u_threaded_context.c
+++ b/src/gallium/auxiliary/util/u_threaded_context.c
@@ -3454,7 +3454,9 @@ tc_fence_server_signal(struct pipe_context *_pipe,
    struct threaded_context *tc = threaded_context(_pipe);
    struct pipe_context *pipe = tc->pipe;
    tc_sync(tc);
+   tc_set_driver_thread(tc);
    pipe->fence_server_signal(pipe, fence);
+   tc_clear_driver_thread(tc);
 }
 
 static struct pipe_video_codec *