diff --git a/IGC/Compiler/CISACodeGen/ShaderCodeGen.cpp b/IGC/Compiler/CISACodeGen/ShaderCodeGen.cpp
index 3543d59eeb53..19edb3f85ea4 100644
--- a/IGC/Compiler/CISACodeGen/ShaderCodeGen.cpp
+++ b/IGC/Compiler/CISACodeGen/ShaderCodeGen.cpp
@@ -768,7 +768,8 @@ void AddLegalizationPasses(CodeGenContext& ctx, IGCPassManager& mpm, PSSignature
         bool AllowVector8LoadStore =
             IGC_IS_FLAG_ENABLED(EnableVector8LoadStore) ||
             ((ctx.type == ShaderType::RAYTRACING_SHADER || ctx.hasSyncRTCalls()) && ctx.platform.supports8DWLSCMessage()) ||
-            ctx.platform.getPlatformInfo().eProductFamily == IGFX_PVC;
+            (ctx.platform.GetPlatformFamily() == IGFX_XE_HPC_CORE && ctx.platform.supports8DWLSCMessage() &&
+                ctx.type == ShaderType::OPENCL_SHADER);
 
         mpm.add(createMemOptPass(AllowNegativeSymPtrsForLoad, AllowVector8LoadStore));