diff --git a/opencl/source/cl_device/cl_device_caps.cpp b/opencl/source/cl_device/cl_device_caps.cpp
index c180d0cb7e..0d4112f534 100644
--- a/opencl/source/cl_device/cl_device_caps.cpp
+++ b/opencl/source/cl_device/cl_device_caps.cpp
@@ -246,7 +246,7 @@ void ClDevice::initializeCaps() {
     deviceInfo.memBaseAddressAlign = 1024;
     deviceInfo.minDataTypeAlignSize = 128;
 
-    if (isDeviceEnqueueSupported()) {
+    if (isDeviceEnqueueSupported() || (enabledClVersion == 21)) {
         deviceInfo.maxOnDeviceQueues = 1;
         deviceInfo.maxOnDeviceEvents = 1024;
         deviceInfo.queueOnDeviceMaxSize = 64 * MB;
diff --git a/opencl/test/unit_test/device/device_caps_tests.cpp b/opencl/test/unit_test/device/device_caps_tests.cpp
index 97a094dec0..5a9f3ae472 100644
--- a/opencl/test/unit_test/device/device_caps_tests.cpp
+++ b/opencl/test/unit_test/device/device_caps_tests.cpp
@@ -146,7 +146,7 @@ TEST_F(DeviceGetCapsTest, WhenCreatingDeviceThenCapsArePopulatedCorrectly) {
 
     EXPECT_EQ(sharedCaps.maxWorkGroupSize / hwHelper.getMinimalSIMDSize(), caps.maxNumOfSubGroups);
 
-    if (defaultHwInfo->capabilityTable.supportsDeviceEnqueue) {
+    if (defaultHwInfo->capabilityTable.supportsDeviceEnqueue || (defaultHwInfo->capabilityTable.clVersionSupport == 21)) {
         EXPECT_EQ(1024u, caps.maxOnDeviceEvents);
         EXPECT_EQ(1u, caps.maxOnDeviceQueues);
         EXPECT_EQ(64u * MB, caps.queueOnDeviceMaxSize);
@@ -989,6 +989,10 @@ TEST(DeviceGetCaps, givenDebugFlagToUseCertainWorkgroupSizeWhenDeviceIsCreatedIt
 }
 
 TEST(DeviceGetCaps, givenDebugFlagToDisableDeviceEnqueuesWhenCreatingDeviceThenDeviceQueueCapsAreSetCorrectly) {
+    if (defaultHwInfo->capabilityTable.clVersionSupport == 21) {
+        GTEST_SKIP();
+    }
+
     DebugManagerStateRestore dbgRestorer;
     DebugManager.flags.DisableDeviceEnqueue.set(true);