diff --git a/src/amdgpu_dri2.c b/src/amdgpu_dri2.c
index 44316ac947156d518533cc12da1bca7e92095feb..d20542865160557717ebc17b576c7c0a07203461 100644
--- a/src/amdgpu_dri2.c
+++ b/src/amdgpu_dri2.c
@@ -1062,6 +1062,9 @@ static int amdgpu_dri2_schedule_wait_msc(ClientPtr client, DrawablePtr draw,
 out_complete:
 	if (wait_info)
 		amdgpu_dri2_deferred_event(NULL, 0, wait_info);
+	else
+		DRI2WaitMSCComplete(client, draw, 0, 0, 0);
+
 	return TRUE;
 }