diff --git a/scripts/index-demo-page.js b/scripts/index-demo-page.js
index 6304c7b06..5cc609e5d 100644
--- a/scripts/index-demo-page.js
+++ b/scripts/index-demo-page.js
@@ -256,7 +256,7 @@
           liveui: stateEls.liveui.checked,
           html5: {
             hls: {
-              overrideNative: !window.videojs.browser.IS_SAFARI
+              overrideNative: true
             }
           }
         });
@@ -322,6 +322,10 @@
 
     sources.addEventListener('change', function(event) {
       var selectedOption = sources.options[sources.selectedIndex];
+
+      if (!selectedOption) {
+        return;
+      }
       var src = selectedOption.value;
 
       stateEls.url.value = src;