diff --git a/client/src/app/videos/+video-watch/video-watch.component.ts b/client/src/app/videos/+video-watch/video-watch.component.ts
index a281fff23..8330aba15 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.ts
+++ b/client/src/app/videos/+video-watch/video-watch.component.ts
@@ -405,7 +405,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
   }
 
   private updateOtherVideosDisplayed () {
-    if (this.otherVideos.length > 0) {
+    if (this.video && this.otherVideos && this.otherVideos.length > 0) {
       this.otherVideosDisplayed = this.otherVideos.filter(v => v.uuid !== this.video.uuid)
     }
   }