diff --git a/demo/common/assets.js b/demo/common/assets.js
index 2b7c30c10c..9d63e63cd3 100644
--- a/demo/common/assets.js
+++ b/demo/common/assets.js
@@ -123,6 +123,8 @@ shakaAssets.Feature = {
   MP4: shakaDemo.MessageIds.MP4,
   // Set if the asset has at least one MPEG-2 TS stream.
   MP2TS: shakaDemo.MessageIds.MP2TS,
+  // Set if the asset has at least one containerless stream (AAC, etc).
+  CONTAINERLESS: shakaDemo.MessageIds.CONTAINERLESS,
 
   // Set if the asset has at least one stream that is at least 720p.
   HIGH_DEFINITION: shakaDemo.MessageIds.HIGH_DEFINITION,
@@ -1188,6 +1190,14 @@ shakaAssets.testAssets = [
       .addFeature(shakaAssets.Feature.HLS)
       .addFeature(shakaAssets.Feature.LIVE)
       .addFeature(shakaAssets.Feature.MP4),
+  new ShakaDemoAssetInfo(
+      /* name= */ 'Audio only HLS with raw AAC',
+      /* iconUri= */ 'https://storage.googleapis.com/shaka-asset-icons/apple_test_pattern.png',
+      /* manifestUri= */ 'https://storage.googleapis.com/shaka-demo-assets/raw-hls-audio-only/manifest.m3u8',
+      /* source= */ shakaAssets.Source.APPLE)
+      .addFeature(shakaAssets.Feature.HLS)
+      .addFeature(shakaAssets.Feature.CONTAINERLESS)
+      .addFeature(shakaAssets.Feature.AUDIO_ONLY),
   // }}}
 
   // IRT assets {{{
diff --git a/demo/common/message_ids.js b/demo/common/message_ids.js
index d438601f8e..8b6484045a 100644
--- a/demo/common/message_ids.js
+++ b/demo/common/message_ids.js
@@ -13,6 +13,7 @@ shakaDemo.MessageIds = {
   ADS: 'DEMO_ADS',
   AUDIO_ONLY: 'DEMO_AUDIO_ONLY',
   CAPTIONS: 'DEMO_CAPTIONS',
+  CONTAINERLESS: 'DEMO_CONTAINERLESS',
   DASH: 'DEMO_DASH',
   HIGH_DEFINITION: 'DEMO_HIGH_DEFINITION',
   HLS: 'DEMO_HLS',
diff --git a/demo/locales/en.json b/demo/locales/en.json
index 9715d8ed91..d03dcb19c2 100644
--- a/demo/locales/en.json
+++ b/demo/locales/en.json
@@ -39,6 +39,7 @@
   "DEMO_CONNECTION_TIMEOUT": "Connection timeout",
   "DEMO_CONFIG": "Shaka Player Demo Config",
   "DEMO_CONTAINER_SEARCH": "Container",
+  "DEMO_CONTAINERLESS": "Containerless",
   "DEMO_CONTENT_ID": "Content ID",
   "DEMO_CUSTOM": "Custom",
   "DEMO_CUSTOM_CONTENT": "CUSTOM CONTENT",
diff --git a/demo/locales/source.json b/demo/locales/source.json
index 7a5a8ebcad..0cdc7468c5 100644
--- a/demo/locales/source.json
+++ b/demo/locales/source.json
@@ -159,6 +159,10 @@
     "description": "A header on a search field that filters by container type.",
     "message": "Container"
   },
+  "DEMO_CONTAINERLESS": {
+    "description": "Text that describes an asset that has a stream with audio data not contained in a container.",
+    "message": "Containerless"
+  },
   "DEMO_CONTENT_ID": {
     "description": "The name of a configuration value.",
     "message": "Content ID"
diff --git a/demo/search.js b/demo/search.js
index f8783fc983..9750f903c6 100644
--- a/demo/search.js
+++ b/demo/search.js
@@ -362,7 +362,8 @@ shakaDemo.Search = class {
         [Feature.DASH, Feature.HLS], FEATURE);
     this.makeSelectInput_(coreContainer,
         shakaDemo.MessageIds.CONTAINER_SEARCH,
-        [Feature.MP4, Feature.MP2TS, Feature.WEBM], FEATURE);
+        [Feature.MP4, Feature.MP2TS, Feature.WEBM, Feature.CONTAINERLESS],
+        FEATURE);
     this.makeSelectInput_(coreContainer,
         shakaDemo.MessageIds.DRM_SEARCH,
         Object.values(shakaAssets.KeySystem), DRM);