diff --git a/demo/asset_section.js b/demo/asset_section.js
index f06620a9b7..441992ce11 100644
--- a/demo/asset_section.js
+++ b/demo/asset_section.js
@@ -80,6 +80,15 @@ shakaDemo.setupAssets_ = function() {
       option.disabled = true;
     }
 
+    if (asset.features.includes(shakaAssets.Feature.DASH) &&
+        !shakaDemo.support_.manifest['mpd']) {
+      option.disabled = true;
+    }
+    if (asset.features.includes(shakaAssets.Feature.HLS) &&
+        !shakaDemo.support_.manifest['m3u8']) {
+      option.disabled = true;
+    }
+
     if (!option.disabled && !group.disabled) {
       first = first || option;
       if (asset.focus) first = option;
diff --git a/demo/common/assets.js b/demo/common/assets.js
index c5d64e66a9..3a515cf59c 100644
--- a/demo/common/assets.js
+++ b/demo/common/assets.js
@@ -870,6 +870,7 @@ shakaAssets.testAssets = [
     source: shakaAssets.Source.AXINOM,
     drm: [],
     features: [
+      shakaAssets.Feature.DASH,
       shakaAssets.Feature.EMBEDDED_TEXT,
       shakaAssets.Feature.LIVE,
       shakaAssets.Feature.MP4,
@@ -1008,6 +1009,7 @@ shakaAssets.testAssets = [
     source: shakaAssets.Source.DASH_IF,
     drm: [],
     features: [
+      shakaAssets.Feature.DASH,
       shakaAssets.Feature.MP4,
       shakaAssets.Feature.SEGMENT_TEMPLATE_TIMELINE,
       shakaAssets.Feature.OFFLINE,
@@ -1023,6 +1025,7 @@ shakaAssets.testAssets = [
     source: shakaAssets.Source.DASH_IF,
     drm: [],
     features: [
+      shakaAssets.Feature.DASH,
       shakaAssets.Feature.LIVE,
       shakaAssets.Feature.MP4,
       shakaAssets.Feature.SEGMENT_TEMPLATE_DURATION,