diff --git a/app/src/components/VideoPlayer.js b/app/src/components/VideoPlayer.js
index 0c2345b0..2874c056 100644
--- a/app/src/components/VideoPlayer.js
+++ b/app/src/components/VideoPlayer.js
@@ -70,7 +70,7 @@ function VideoPage(props) {
     let descriptionPane = {
         menuItem: 'Description', render: () => <Tab.Pane>
             <pre className="wrap-text">
-                {description}
+                {description || 'No description'}
             </pre>
         </Tab.Pane>
     };
@@ -120,7 +120,7 @@ function VideoPage(props) {
                     <track kind="captions" label="English captions" src={captionsUrl} srcLang="en" default/>
                 </video>
 
-                <h2>{video.title}</h2>
+                <h2>{video.title || video.video_path}</h2>
                 {video.upload_date && <h3>{uploadDate(video.upload_date)}</h3>}
                 <h3>
                     {channel && <Link to={`/videos/channel/${channel.link}/video`}>
diff --git a/modules/videos/common.py b/modules/videos/common.py
index ef34c144..0f4ba034 100644
--- a/modules/videos/common.py
+++ b/modules/videos/common.py
@@ -461,8 +461,7 @@ async def get_bulk_video_info_json(video_ids: List[int]):
                         video.duration = get_video_duration(video.video_path.path)
                     if not video.title:
                         # Use the video path name without the extension.
-                        video_path = video.video_path.path.with_suffix('')
-                        video.title = video_path.name
+                        video.title = video.video_path.path.with_suffix('').name
 
                     # Unescape any HTML entities.
                     video.title = html.unescape(video.title)