diff --git a/src/content.ts b/src/content.ts
index d9b3646b..6be2951f 100644
--- a/src/content.ts
+++ b/src/content.ts
@@ -1044,7 +1044,7 @@ async function sponsorsLookup(keepOldSubmissions = true) {
 
 function importExistingChapters(wait: boolean) {
     if (!existingChaptersImported) {
-        GenericUtils.wait(() => video && getExistingChapters(sponsorVideoID, video.duration),
+        GenericUtils.wait(() => video?.duration && getExistingChapters(sponsorVideoID, video.duration),
             wait ? 5000 : 0, 100, (c) => c?.length > 0).then((chapters) => {
                 if (!existingChaptersImported && chapters?.length > 0) {
                     sponsorTimes = (sponsorTimes ?? []).concat(...chapters).sort((a, b) => a.segment[0] - b.segment[0]);
diff --git a/src/js-components/previewBar.ts b/src/js-components/previewBar.ts
index 3b19910b..19480ef1 100644
--- a/src/js-components/previewBar.ts
+++ b/src/js-components/previewBar.ts
@@ -682,8 +682,6 @@ class PreviewBar {
         const chaptersContainer = document.querySelector(".ytp-chapter-container") as HTMLDivElement;
 
         if (chaptersContainer) {
-            // TODO: Check if existing chapters exist (if big chapters menu is available?)
-
             if (segments.length > 0) {
                 chaptersContainer.style.removeProperty("display");
 
@@ -721,7 +719,6 @@ class PreviewBar {
                     this.chapterVote.setVisibility(false);
                 }
             } else {
-                // Hide chapters menu again
                 chaptersContainer.style.display = "none";
                 this.chapterVote.setVisibility(false);
             }