diff --git a/AUTHORS b/AUTHORS
index cb96fe4539..4039c7f51f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -61,6 +61,7 @@ Prakash <duggaraju@gmail.com>
 Robert Colantuoni <rgc@colantuoni.com>
 Robert Galluccio <robertnw5@gmail.com>
 Rodolphe Breton <robloche@gmail.com>
+Rohan Gupta <rohangupta1528@gmail.com>
 Roi Lipman <roilipman@gmail.com>
 Roksolana Ivanyshyn <roksolana.ivanyshyn.pub@gmail.com>
 Rostislav Hejduk <Ross-cz@users.noreply.github.com>
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 4b0b8b2c55..63d89447b4 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -91,6 +91,7 @@ Robert Colantuoni <rgc@colantuoni.com>
 Robert Galluccio <robertnw5@gmail.com>
 Rodolphe Breton <robloche@gmail.com>
 Rohit Makasana <rohitbm@google.com>
+Rohan Gupta <rohangupta1528@gmail.com>
 Roi Lipman <roilipman@gmail.com>
 Roksolana Ivanyshyn <roksolana.ivanyshyn.pub@gmail.com>
 Rostislav Hejduk <Ross-cz@users.noreply.github.com>
diff --git a/lib/player.js b/lib/player.js
index f1dd42820b..cd8e01dc12 100644
--- a/lib/player.js
+++ b/lib/player.js
@@ -3952,16 +3952,25 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       return [];
     }
     const chapters = [];
+    const uniqueChapters = new Set();
     for (const chaptersTrack of chaptersTracksWithLanguage) {
       if (chaptersTrack && chaptersTrack.cues) {
         for (const cue of chaptersTrack.cues) {
+          let id = cue.id;
+          if (!id || id == '') {
+            id = cue.startTime + '-' + cue.endTime + '-' + cue.text;
+          }
           /** @type {shaka.extern.Chapter} */
           const chapter = {
+            id: id,
             title: cue.text,
             startTime: cue.startTime,
             endTime: cue.endTime,
           };
-          chapters.push(chapter);
+          if (!uniqueChapters.has(id)) {
+            chapters.push(chapter);
+            uniqueChapters.add(id);
+          }
         }
       }
     }