diff --git a/src/mesa/state_tracker/st_cb_syncobj.c b/src/mesa/state_tracker/st_cb_syncobj.c
index 637fbe3b73a..83777e3e707 100644
--- a/src/mesa/state_tracker/st_cb_syncobj.c
+++ b/src/mesa/state_tracker/st_cb_syncobj.c
@@ -123,22 +123,21 @@ static void st_client_wait_sync(struct gl_context *ctx,
 
 static void st_check_sync(struct gl_context *ctx, struct gl_sync_object *obj)
 {
    st_client_wait_sync(ctx, obj, 0, 0);
 }
 
 static void st_server_wait_sync(struct gl_context *ctx,
                                 struct gl_sync_object *obj,
                                 GLbitfield flags, GLuint64 timeout)
 {
-   /* NO-OP.
-    * Neither Gallium nor DRM interfaces support blocking on the GPU. */
+   st_client_wait_sync(ctx, obj, flags, timeout);
 }
 
 void st_init_syncobj_functions(struct dd_function_table *functions)
 {
    functions->NewSyncObject = st_new_sync_object;
    functions->FenceSync = st_fence_sync;
    functions->DeleteSyncObject = st_delete_sync_object;
    functions->CheckSync = st_check_sync;
    functions->ClientWaitSync = st_client_wait_sync;
    functions->ServerWaitSync = st_server_wait_sync;