diff --git a/lib/CL/devices/level0/level0-driver.cc b/lib/CL/devices/level0/level0-driver.cc
index e58b1ce06e6059e8daad06bba9388c9baf99d101..dd08fcb07c71d514be099f0188fbdd562ae47f07 100644
--- a/lib/CL/devices/level0/level0-driver.cc
+++ b/lib/CL/devices/level0/level0-driver.cc
@@ -2060,7 +2060,8 @@ bool Level0Device::setupDeviceProperties(bool HasIPVersionExt) {
 #else
     ClDev->supported_spir_v_versions = "SPIR-V_1.2 SPIR-V_1.1 SPIR-V_1.0";
 #endif
-    ClDev->on_host_queue_props = CL_QUEUE_PROFILING_ENABLE;
+    ClDev->on_host_queue_props
+        = CL_QUEUE_OUT_OF_ORDER_EXEC_MODE_ENABLE | CL_QUEUE_PROFILING_ENABLE;
     ClDev->version_of_latest_passed_cts = "v2000-12-31-01";
   }
 
diff --git a/lib/CL/devices/proxy/pocl_proxy.c b/lib/CL/devices/proxy/pocl_proxy.c
index 233164569a2d9988b703b5bf6c1bc70a626bfe9b..a9e3f461ebcc78321fbafade7416ea8926a11b95 100644
--- a/lib/CL/devices/proxy/pocl_proxy.c
+++ b/lib/CL/devices/proxy/pocl_proxy.c
@@ -515,7 +515,6 @@ pocl_proxy_get_device_info (cl_device_id device, proxy_device_data_t *d)
   DIstring (profile, CL_DEVICE_PROFILE);
 
   // TODO queue properties
-  device->queue_properties = CL_QUEUE_PROFILING_ENABLE;
   DIbool (available[0], CL_DEVICE_AVAILABLE);
   DIbool (compiler_available, CL_DEVICE_COMPILER_AVAILABLE);
   DIbool (linker_available, CL_DEVICE_LINKER_AVAILABLE);
diff --git a/lib/CL/devices/remote/communication.c b/lib/CL/devices/remote/communication.c
index 3f3faf6b3887e0d1565b524a08489e97ba0daddd..3a5b1b30dbfd81cb5b810206f5c43c0ccdc133c0 100644
--- a/lib/CL/devices/remote/communication.c
+++ b/lib/CL/devices/remote/communication.c
@@ -1987,7 +1987,7 @@ pocl_network_fetch_devinfo (cl_device_id device,
 
   device->profile
       = (devinfo->full_profile ? "FULL_PROFILE" : "EMBEDDED_PROFILE");
-  device->queue_properties = CL_QUEUE_PROFILING_ENABLE;
+  device->on_host_queue_props = CL_QUEUE_PROFILING_ENABLE;
   device->compiler_available = 1;
   device->linker_available = 1;
 
diff --git a/lib/CL/devices/tce/ttasim/ttasim.cc b/lib/CL/devices/tce/ttasim/ttasim.cc
index cf74c974904c714e1e2b55565c0651816aec033c..e9305e6cbcb6b154d16ee400784527a7fb18afd0 100644
--- a/lib/CL/devices/tce/ttasim/ttasim.cc
+++ b/lib/CL/devices/tce/ttasim/ttasim.cc
@@ -700,7 +700,7 @@ pocl_ttasim_init (unsigned j, cl_device_id dev, const char* parameters)
   dev->spmd = CL_FALSE;
   dev->run_workgroup_pass = CL_TRUE;
   dev->execution_capabilities = CL_EXEC_KERNEL;
-  dev->queue_properties = CL_QUEUE_PROFILING_ENABLE;
+  dev->on_host_queue_props = CL_QUEUE_PROFILING_ENABLE;
   dev->vendor = "TTA-Based Co-design Environment";
   dev->profile = "EMBEDDED_PROFILE";
   dev->extensions = TCE_DEVICE_EXTENSIONS;
diff --git a/lib/CL/devices/vulkan/pocl-vulkan.c b/lib/CL/devices/vulkan/pocl-vulkan.c
index d3b3095e934338efbb2b5d8e35e82e7a7979f94c..1dcacf9d8e3da93c4ca6dd8d1d9aa4f5e10dc88d 100644
--- a/lib/CL/devices/vulkan/pocl-vulkan.c
+++ b/lib/CL/devices/vulkan/pocl-vulkan.c
@@ -1460,6 +1460,7 @@ pocl_vulkan_init (unsigned j, cl_device_id dev, const char *parameters)
     strcat (extensions, " cl_khr_fp64");
 
   dev->extensions = strdup (extensions);
+  dev->on_host_queue_props = CL_QUEUE_PROFILING_ENABLE;
 
   if (dev->vendor_id == 0x10de)
     {
diff --git a/lib/CL/pocl_cl.h b/lib/CL/pocl_cl.h
index 25856528ac031da79966deb7e82d2775979f5a26..7550aa7f22c7140d9eaec9b26460a190aab5bcac 100644
--- a/lib/CL/pocl_cl.h
+++ b/lib/CL/pocl_cl.h
@@ -1102,7 +1102,6 @@ struct _cl_device_id {
    * _clang_opencl.h. For most drivers, this should default to CL_FALSE. */
   cl_bool use_only_clang_opencl_headers;
   cl_device_exec_capabilities execution_capabilities;
-  cl_command_queue_properties queue_properties;
   cl_platform_id platform;
   cl_uint max_sub_devices;
   size_t num_partition_properties;