diff --git a/OpenCL/inc_common.cl b/OpenCL/inc_common.cl
index 00d68110c..a65fd21c7 100644
--- a/OpenCL/inc_common.cl
+++ b/OpenCL/inc_common.cl
@@ -2066,6 +2066,12 @@ DECLSPEC int hc_enc_next (hc_enc_t *hc_enc, const u32 *src_buf, const int src_le
 
   int src_pos = hc_enc->pos;
 
+  #if VENDOR_ID == 8
+  // Work around segmentation fault in Intel JiT
+  // Tested with 2021.12.6.0.19_160000
+  volatile
+  #endif
+
   int dst_pos = hc_enc->clen;
 
   dst_buf[0] = hc_enc->cbuf;
@@ -2197,6 +2203,12 @@ DECLSPEC int hc_enc_next_global (hc_enc_t *hc_enc, GLOBAL_AS const u32 *src_buf,
 
   int src_pos = hc_enc->pos;
 
+  #if VENDOR_ID == 8
+  // Work around segmentation fault in Intel JiT
+  // Tested with 2021.12.6.0.19_160000
+  volatile
+  #endif
+
   int dst_pos = hc_enc->clen;
 
   dst_buf[0] = hc_enc->cbuf;
diff --git a/OpenCL/inc_vendor.h b/OpenCL/inc_vendor.h
index bbd7e23d8..43f5d8fb8 100644
--- a/OpenCL/inc_vendor.h
+++ b/OpenCL/inc_vendor.h
@@ -16,7 +16,6 @@
 #define IS_OPENCL
 #endif
 
-
 #if defined IS_NATIVE
 #define CONSTANT_VK
 #define CONSTANT_AS