diff --git a/app/assets/javascripts/stream_player.js.erb b/app/assets/javascripts/stream_player.js.erb
index 67296c6..7b44d55 100644
--- a/app/assets/javascripts/stream_player.js.erb
+++ b/app/assets/javascripts/stream_player.js.erb
@@ -1,4 +1,6 @@
 $(document).on("click", "[data-behavior=play_recording]", function() {
+    $("#raw-video-embed").remove();
+
     clearPlayingHighlight();
     $(this).parent().parent().addClass('playing-highlight');
 
@@ -18,7 +20,6 @@ $(document).on("click", "[data-behavior=play_recording]", function() {
 });
 
 $(document).on("click", "[data-behavior=play_stream]", function() {
-//    clearPlayingHighlight();
     $("#broadcast_video").data('videoType', 'stream');
 });
 
diff --git a/app/views/broadcasts/_video.html.erb b/app/views/broadcasts/_video.html.erb
index d6db39b..ed69f96 100644
--- a/app/views/broadcasts/_video.html.erb
+++ b/app/views/broadcasts/_video.html.erb
@@ -1,6 +1,7 @@
 <% if broadcast.director_mode_video_embed.present? && params[:non_director_mode].nil? %>
   <div id="director_broadcast_video" class="embed-responsive-item" data-video-type="stream">
-    <%= raw broadcast.director_mode_video_embed %>
+    <div id="broadcast_video" class="embed-responsive-item" data-video-type="strean"></div>
+    <div id="raw-video-embed"><%= raw broadcast.director_mode_video_embed %></div>
   </div>
 <% elsif broadcast.streamer_recording? && broadcast.active? %>
   <div id="broadcast_video" class="embed-responsive-item" data-video-type="stream"></div>