diff --git a/pyopencl/cffi_cl.py b/pyopencl/cffi_cl.py
index 62f9edbfa2e903cd8143a388f63832692e18314f..51a822868bbd94273dcc459b36845844ed89c6e3 100644
--- a/pyopencl/cffi_cl.py
+++ b/pyopencl/cffi_cl.py
@@ -1855,6 +1855,8 @@ Event.profile = property(ProfilingInfoGetter)
 
 
 def wait_for_events(wait_for):
+    if wait_for is None or len(wait_for) == 0:
+        return
     _handle_error(_lib.wait_for_events(*_clobj_list(wait_for)))