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>
diff --git a/spec/features/user_managing_broadcasts_spec.rb b/spec/features/user_managing_broadcasts_spec.rb
index e781f24..ecba272 100644
--- a/spec/features/user_managing_broadcasts_spec.rb
+++ b/spec/features/user_managing_broadcasts_spec.rb
@@ -204,12 +204,31 @@ feature 'User managing broadcasts' do
 
       visit project_broadcast_path(project, broadcast)
 
-      expect(page).not_to have_selector('#broadcast_video')
+      expect(page).to have_selector('#raw-video-embed')
       expect(page).to have_selector('#director_broadcast_video')
 
       expect(page).to have_selector('#director_mode_switch')
     end
 
+    scenario 'playing recordings is possible in director mode', js: true do
+      broadcast = create(:broadcast, :with_stream, :with_files, project: project, director_mode_video_embed: 'director_mode')
+      create(:broadcast_recording, broadcast: broadcast, asset_uid: "asset_uid_1")
+      create(:broadcast_recording, broadcast: broadcast, asset_uid: "asset_uid_2")
+
+      visit project_broadcast_path(project, broadcast)
+
+      expect(page).to have_selector('#raw-video-embed')
+      expect(page).to have_selector('#broadcast_video')
+
+      broadcast_video_div = find('#broadcast_video')
+      expect(broadcast_video_div.all('*').length).to eq 0
+
+      first("[data-behavior='play_recording']").click
+
+      expect(page).not_to have_selector('#raw-video-embed')
+      expect(broadcast_video_div.all('*').length).to be > 2
+    end
+
     context 'When the user is associate' do
       let(:current_user) { create(:user, :associate) }