diff --git a/web/assets/js/bs5.videoPlayer.js b/web/assets/js/bs5.videoPlayer.js
index 19aae7e6..d3648042 100644
--- a/web/assets/js/bs5.videoPlayer.js
+++ b/web/assets/js/bs5.videoPlayer.js
@@ -7,7 +7,7 @@ $(document).ready(function(){
         var newTabId = getVideoPlayerTabId(video)
         var humanStartTime = formattedTime(video.time,true)
         var humanEndTime = formattedTime(video.end,true)
-        var tabLabel = `<b>${lang['Video']}</b> : ${loadedMonitors[video.mid].name} : ${formattedTime(video.time,true)}`
+        var tabLabel = `<b>${lang['Video']}</b> : ${loadedMonitors[video.mid] ? loadedMonitors[video.mid].name : lang['Monitor or Key does not exist.']} : ${formattedTime(video.time,true)}`
         var videoUrl = getLocation() + video.href
         var hasRows = video.events && video.events.length > 0
         var loadedEvents = {}
diff --git a/web/assets/js/bs5.videos.js b/web/assets/js/bs5.videos.js
index 39d458ee..39fe2ac5 100644
--- a/web/assets/js/bs5.videos.js
+++ b/web/assets/js/bs5.videos.js
@@ -340,13 +340,17 @@ function getAllDays(videos,frames){
     })
     videos.forEach(function(video){
         var videoTime = new Date(video.time)
+        var monitorId = video.mid
         var theDayKey = `${videoTime.getDate()}-${videoTime.getMonth()}-${videoTime.getFullYear()}`
-        listOfDays[video.mid][theDayKey] = []
+        if(!listOfDays[monitorId])listOfDays[monitorId] = {};
+        listOfDays[monitorId][theDayKey] = []
     })
     frames.forEach(function(frame){
         var frameTime = new Date(frame.time)
+        var monitorId = frame.mid
         var theDayKey = `${frameTime.getDate()}-${frameTime.getMonth()}-${frameTime.getFullYear()}`
-        listOfDays[frame.mid][theDayKey] = []
+        if(!listOfDays[monitorId])listOfDays[monitorId] = {};
+        listOfDays[monitorId][theDayKey] = []
     })
     return listOfDays
 }