diff --git a/sys/msdk/gstmsdkmjpegdec.c b/sys/msdk/gstmsdkmjpegdec.c
index 6ae02d6..ef37775 100644
--- a/sys/msdk/gstmsdkmjpegdec.c
+++ b/sys/msdk/gstmsdkmjpegdec.c
@@ -62,6 +62,14 @@
 gst_msdkmjpegdec_configure (GstMsdkDec * decoder)
 {
   decoder->param.mfx.CodecId = MFX_CODEC_JPEG;
+
+  /* HACK to make sure MSDK won't crash while handling non-interleaved samples */
+  /* setting MFX_SCANTYPE_UNKNOWN (== 0) causing issues for
+     non-interleaved samples. Usage of MFXVideoDECODE_DecodeHeader
+     also doesn't seems to fix the issue. But even if we hardcode
+     the InterleaveDec to MFX_SCANTYPE_NONINTERLEAVED, msdk seems to be taking care
+     of Interleaved samples, so let's hardcode it for now */
+  decoder->param.mfx.InterleavedDec = MFX_SCANTYPE_NONINTERLEAVED;
   return TRUE;
 }