diff --git a/meta-emenlow/conf/machine/emenlow.conf b/meta-emenlow/conf/machine/emenlow.conf
index de316b7d..39da41cb 100644
--- a/meta-emenlow/conf/machine/emenlow.conf
+++ b/meta-emenlow/conf/machine/emenlow.conf
@@ -25,7 +25,10 @@ PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0"
 
 APPEND += "video=vesafb vga=0x318 vmalloc=256MB"
 
-VA_FEATURES = "${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", \
-	    "commercial", "gst-va-intel va-intel", "va-intel", d)}"
+# Some of the EMGD components have dependency on libx11.
+# Add these only when Xserver is enabled with the EMGD driver
+# Otherwise unwanted X components will start showing up in the non-X images
+VA_FEATURES ?= "gst-va-intel va-intel \
+                ${@bb.utils.contains("XSERVER", "emgd-driver-bin", "emgd-driver-video emgd-gst-plugins-va-0.10.10 emgd-gst-plugins-mixvideo-0.10.34", "", d)}"
 
 MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}"