diff --git a/app/src/DownloadQueue.py b/app/src/DownloadQueue.py
index 07bbe962..e2678cc7 100644
--- a/app/src/DownloadQueue.py
+++ b/app/src/DownloadQueue.py
@@ -56,11 +56,14 @@ class DownloadQueue:
         error: str = None
         live_in: str = None
 
-        if 'live_status' in entry and 'release_timestamp' in entry and entry.get('live_status') == 'is_upcoming' and entry.get('release_timestamp'):
-            dt_ts = datetime.fromtimestamp(
-                entry.get('release_timestamp'), tz=timezone.utc).strftime('%Y-%m-%d %H:%M:%S %z')
-            error = f"Live stream is scheduled to start at {dt_ts}"
-            live_in = formatdate(entry.get('release_timestamp'))
+        if 'live_status' in entry and entry.get('live_status') == 'is_upcoming':
+            if 'release_timestamp' in entry and entry.get('release_timestamp'):
+                dt_ts = datetime.fromtimestamp(
+                    entry.get('release_timestamp'), tz=timezone.utc).strftime('%Y-%m-%d %H:%M:%S %z')
+                error = f"Live stream is scheduled to start at {dt_ts}"
+                live_in = formatdate(entry.get('release_timestamp'))
+            else:
+                error = 'Live stream not yet started. And no date is set.'
         else:
             error = entry['msg'] if 'msg' in entry else None
 
diff --git a/frontend/src/components/Page-Completed.vue b/frontend/src/components/Page-Completed.vue
index f979584a..2abb6aa1 100644
--- a/frontend/src/components/Page-Completed.vue
+++ b/frontend/src/components/Page-Completed.vue
@@ -94,12 +94,12 @@
               </div>
               <div class="column is-4 has-text-centered">
                 <span :date-datetime="item.datetime"
-                  :data-tooltip="moment(item.datetime).format('MMMM Do YYYY, h:mm:ss a')">
+                  :data-tooltip="moment(item.datetime).format('YYYY-M-DD H:mm Z')">
                   {{ moment(item.datetime).fromNow() }}
                 </span>
               </div>
               <div class="column is-4 has-text-centered" v-if="item.live_in && item.status != 'finished'">
-                <span :date-datetime="item.datetime" data-tooltip="Live in">
+                <span :date-datetime="item.datetime" :data-tooltip="'Will start at: ' + moment(item.live_in).format('YYYY-M-DD H:mm Z')">
                   {{ moment(item.live_in).fromNow() }}
                 </span>
               </div>