diff --git a/gst-libs/gst/vaapi/gstvaapicontext.c b/gst-libs/gst/vaapi/gstvaapicontext.c
index 87ea48efb5..ffa74580b8 100644
--- a/gst-libs/gst/vaapi/gstvaapicontext.c
+++ b/gst-libs/gst/vaapi/gstvaapicontext.c
@@ -246,6 +246,23 @@ context_create (GstVaapiContext * context)
         attrib->value = config->packed_headers;
         attrib++;
       }
+#if VA_CHECK_VERSION(0,37,0)
+      if (cip->profile == GST_VAAPI_PROFILE_JPEG_BASELINE) {
+        VAConfigAttribValEncJPEG jpeg_attrib_val;
+        /* JPEG Encoding Attribute */
+        attrib->type = VAConfigAttribEncJPEG;
+        if (!context_get_attribute (context, attrib->type, &value))
+          goto cleanup;
+        jpeg_attrib_val.value = attrib->value;
+        /* Set JPEG profile attribs */
+        jpeg_attrib_val.bits.arithmatic_coding_mode = 0;
+        jpeg_attrib_val.bits.progressive_dct_mode = 0;
+        jpeg_attrib_val.bits.non_interleaved_mode = 1;
+        jpeg_attrib_val.bits.differential_mode = 0;
+        attrib->value = jpeg_attrib_val.value;
+        attrib++;
+      }
+#endif
       break;
     }
 #endif