diff --git a/gst/vaapi/gstvaapisink.c b/gst/vaapi/gstvaapisink.c
index 013a4690a5..d01c72775c 100644
--- a/gst/vaapi/gstvaapisink.c
+++ b/gst/vaapi/gstvaapisink.c
@@ -588,6 +588,7 @@ gst_vaapisink_video_overlay_set_event_handling (GstVideoOverlay * overlay,
 {
   GstVaapiSink *const sink = GST_VAAPISINK (overlay);
 
+  sink->handle_events = handle_events;
   gst_vaapisink_set_event_handling (sink, handle_events);
 }
 
@@ -934,7 +935,6 @@ gst_vaapisink_set_event_handling (GstVaapiSink * sink, gboolean handle_events)
     return;
 
   GST_OBJECT_LOCK (sink);
-  sink->handle_events = handle_events;
   if (handle_events && !sink->event_thread) {
     /* Setup our event listening thread */
     GST_DEBUG ("starting xevent thread");