diff --git a/lib/intel_batchbuffer.c b/lib/intel_batchbuffer.c
index 6fc81400a77039da7382561f4c499cb30d7de298..10d8a6e0c88741a536f0bd52073b569f2f25513a 100644
--- a/lib/intel_batchbuffer.c
+++ b/lib/intel_batchbuffer.c
@@ -1187,8 +1187,9 @@ igt_fillfunc_t igt_get_media_fillfunc(int devid)
 igt_vme_func_t igt_get_media_vme_func(int devid)
 {
 	igt_vme_func_t fill = NULL;
+	const struct intel_device_info *devinfo = intel_get_device_info(devid);
 
-	if (IS_GEN11(devid))
+	if (IS_GEN11(devid) && !devinfo->is_elkhartlake && !devinfo->is_jasperlake)
 		fill = gen11_media_vme_func;
 
 	return fill;