diff --git a/record-and-playback/core/lib/recordandplayback/generators/events.rb b/record-and-playback/core/lib/recordandplayback/generators/events.rb
index 0574d5be95a1a73d0944f7ca7cb7979bfa6e5810..92628f1ac9cbd0e5ba6fc11a843dce254d7db062 100755
--- a/record-and-playback/core/lib/recordandplayback/generators/events.rb
+++ b/record-and-playback/core/lib/recordandplayback/generators/events.rb
@@ -219,7 +219,7 @@ module BigBlueButton
           filename = start_event.at_xpath('file').text
           filename = "#{archive_dir}/deskshare/#{File.basename(filename)}"
         when 'StartWebRTCDesktopShareEvent'
-          uri = event.at_xpath('filename').text
+          uri = start_event.at_xpath('filename').text
           filename = "#{archive_dir}/deskshare/#{File.basename(uri)}"
         else
           next
@@ -240,10 +240,10 @@ module BigBlueButton
       events.xpath('/recording/event[@module="Deskshare" or @module="bbb-webrtc-sfu"]').each do |stop_event|
         case stop_event['eventname']
         when 'DeskshareStoppedEvent'
-          filename = start_event.at_xpath('file').text
+          filename = stop_event.at_xpath('file').text
           filename = "#{archive_dir}/deskshare/#{File.basename(filename)}"
         when 'StopWebRTCDesktopShareEvent'
-          uri = event.at_xpath('filename').text
+          uri = stop_event.at_xpath('filename').text
           filename = "#{archive_dir}/deskshare/#{File.basename(uri)}"
         else
           next