diff --git a/IGC/Compiler/CISACodeGen/Platform.hpp b/IGC/Compiler/CISACodeGen/Platform.hpp
index cf36c8524993..8427c8c057aa 100644
--- a/IGC/Compiler/CISACodeGen/Platform.hpp
+++ b/IGC/Compiler/CISACodeGen/Platform.hpp
@@ -1782,7 +1782,7 @@ bool preferLSCCache() const
 
 bool allowDivergentControlFlowRayQueryCheckRelease() const
 {
-    return false;
+    return m_WaTable.Wa_22019804511 != 0;
 }
 
 };
diff --git a/inc/common/sku_wa_defs.h b/inc/common/sku_wa_defs.h
index 3d34ac1fa2d3..65b75cfd1eb3 100644
--- a/inc/common/sku_wa_defs.h
+++ b/inc/common/sku_wa_defs.h
@@ -657,3 +657,9 @@ SPDX-License-Identifier: MIT
         WA_BUG_TYPE_UNKNOWN,
         WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
 
+        WA_DECLARE(
+        Wa_22019804511,
+        "Workaround",
+        WA_BUG_TYPE_UNKNOWN,
+        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
+