diff --git a/doc/runtime_memory.rst b/doc/runtime_memory.rst
index fc121554842af4c6565d88fe1305082fd76cf7f5..f4e01f26642c9cd76153da90bb6dffaed4ecc7d9 100644
--- a/doc/runtime_memory.rst
+++ b/doc/runtime_memory.rst
@@ -384,7 +384,7 @@ Samplers
 Pipes
 -----
 
-.. class:: Pipe(context, flags, packet_size, max_packets, properties)
+.. class:: Pipe(context, flags, packet_size, max_packets, properties=())
 
     See :class:`mem_flags` for values of *flags*.
 
@@ -392,11 +392,16 @@ Pipes
         of keys and values from :class:`pipe_properties` as accepted
         by :c:func:`clCreatePipe`. The trailing *0* is added automatically
         and does not need to be included.
+        (This argument must currently be empty.)
 
-    This function Requires OpenCL 2 or newer.
+    This function requires OpenCL 2 or newer.
 
     .. versionadded:: 2020.3
 
+    .. versionchanged:: 2021.1.7
+
+        *properties* now defaults to an empty tuple.
+
     .. method:: get_pipe_info(param)
 
         See :class:`pipe_info` for values of *param*.
diff --git a/src/wrap_cl.hpp b/src/wrap_cl.hpp
index 03932d828e29bee75c4b17b47f797e05b5b322df..4c40e37341c0c1035878986f1bcedb476e350a20 100644
--- a/src/wrap_cl.hpp
+++ b/src/wrap_cl.hpp
@@ -3157,6 +3157,7 @@ namespace pyopencl
       cl_uint pipe_max_packets,
       py::sequence py_props)
   {
+#if 0
     PYOPENCL_STACK_CONTAINER(cl_pipe_properties, props, py::len(py_props) + 1);
     {
       size_t i = 0;
@@ -3164,6 +3165,10 @@ namespace pyopencl
         props[i++] = py::cast<cl_pipe_properties>(prop);
       props[i++] = 0;
     }
+#endif
+    if (py::len(py_props) != 0)
+      throw pyopencl::error("Pipe", CL_INVALID_VALUE, "non-empty properties "
+          "argument to Pipe not allowed");
 
     cl_int status_code;
     PYOPENCL_PRINT_CALL_TRACE("clCreatePipe");
@@ -3173,7 +3178,7 @@ namespace pyopencl
         flags,
         pipe_packet_size,
         pipe_max_packets,
-        PYOPENCL_STACK_CONTAINER_GET_PTR(props),
+        nullptr,
         &status_code);
 
     if (status_code != CL_SUCCESS)
diff --git a/src/wrap_cl_part_2.cpp b/src/wrap_cl_part_2.cpp
index 205b31ec452b388fe1b32f3443e63762b33a10c0..0c9a0d1b1eb168b631d30aa5965d6a9f58e6d105 100644
--- a/src/wrap_cl_part_2.cpp
+++ b/src/wrap_cl_part_2.cpp
@@ -243,7 +243,7 @@ void pyopencl_expose_part_2(py::module &m)
           py::arg("flags"),
           py::arg("packet_size"),
           py::arg("max_packets"),
-          py::arg("properties")
+          py::arg("properties")=py::make_tuple()
           )
 #endif
       .DEF_SIMPLE_METHOD(get_pipe_info)