diff --git a/app/assets/javascripts/channels/broadcasts.coffee b/app/assets/javascripts/channels/broadcasts.coffee.erb
similarity index 93%
rename from app/assets/javascripts/channels/broadcasts.coffee
rename to app/assets/javascripts/channels/broadcasts.coffee.erb
index 823da04..b2e1f4a 100644
--- a/app/assets/javascripts/channels/broadcasts.coffee
+++ b/app/assets/javascripts/channels/broadcasts.coffee.erb
@@ -21,10 +21,11 @@ $(document).on "turbolinks:load", ->
 
     refreshBroadcastVideo: (data) ->
       $("#broadcast_updates").html data.status_content
-      stream_selected = $("#broadcast_video").attr('video-type') == 'stream';
+      stream_selected = $("#broadcast_video").data('videoType') == 'stream';
       if data.streamer_status == 'recording' && data.status == 'active' && stream_selected
         $("#broadcast_video").html data.video_content
         new (Clappr.Player)(
+          <%= "baseUrl: 'http://cdn.clappr.io/latest'," if Rails.env.test? %>
           parentId: '#broadcast_video'
           source: data.full_live_stream_playback_url
           width: '100%',
diff --git a/app/assets/javascripts/stream_player.js.erb b/app/assets/javascripts/stream_player.js.erb
index 4a9f00d..a59e859 100644
--- a/app/assets/javascripts/stream_player.js.erb
+++ b/app/assets/javascripts/stream_player.js.erb
@@ -3,7 +3,7 @@ $(document).on("click", "[data-behavior=play_recording]", function() {
         return false;
     }
 
-    $("#broadcast_video").attr('video-type', 'recording');
+    $("#broadcast_video").data('videoType', 'recording');
 
     var playback_url = $(this).attr("data-playback-url")
     $("#broadcast_video").empty();
@@ -25,4 +25,4 @@ $(document).on("click", "[data-behavior=play_recording]", function() {
     $(this).prepend('<i class="fa fa-check">&nbsp;</i>');
 });
 
-$(document).on("click", "[data-behavior=play_stream]", function() { $("#broadcast_video").attr('video-type', 'stream'); });
\ No newline at end of file
+$(document).on("click", "[data-behavior=play_stream]", function() { $("#broadcast_video").data('videoType', 'stream'); });
\ No newline at end of file
diff --git a/app/views/broadcasts/_video.html.erb b/app/views/broadcasts/_video.html.erb
index 45fccca..9c44e2a 100644
--- a/app/views/broadcasts/_video.html.erb
+++ b/app/views/broadcasts/_video.html.erb
@@ -1,7 +1,7 @@
 <% if broadcast.streamer_recording? && broadcast.active? %>
-  <div id="broadcast_video" class="embed-responsive-item"></div>
+  <div id="broadcast_video" class="embed-responsive-item" data-video-type="stream"></div>
 <% else %>
-  <div id="broadcast_video" class="embed-responsive-item">
+  <div id="broadcast_video" class="embed-responsive-item" data-video-type="stream">
     <table class="w-100 h-100 bg-secondary">
       <tbody>
         <tr>
diff --git a/spec/features/user_managing_broadcasts_spec.rb b/spec/features/user_managing_broadcasts_spec.rb
index b20cabc..320ef78 100644
--- a/spec/features/user_managing_broadcasts_spec.rb
+++ b/spec/features/user_managing_broadcasts_spec.rb
@@ -93,7 +93,7 @@ feature 'User managing broadcasts' do
       BroadcastsChannel.broadcast_stream_updates(broadcast)
 
       expect(page).to have_content stream_begun_message
-      expect(page).to have_selector('div#broadcast_video', count: 1)
+      expect(page).to have_selector('div#broadcast_video', count: 2)
 
       broadcast.streamer_status = :idle
       broadcast.status = :idle