diff --git a/src/lib/Preview.js b/src/lib/Preview.js
index 7ea6ec218..6584b4a2e 100644
--- a/src/lib/Preview.js
+++ b/src/lib/Preview.js
@@ -1238,9 +1238,6 @@ class Preview extends EventEmitter {
             case VIEWER_EVENT.progressEnd:
                 this.ui.finishProgressBar();
                 break;
-            case VIEWER_EVENT.mediaEndAutoplay:
-                this.navigateRight();
-                break;
             case VIEWER_EVENT.error:
                 // Do nothing since 'error' event was already caught, and will be emitted
                 // as a 'preview_error' event
diff --git a/src/lib/__tests__/Preview-test.js b/src/lib/__tests__/Preview-test.js
index 3a3f29be3..bd3dff543 100644
--- a/src/lib/__tests__/Preview-test.js
+++ b/src/lib/__tests__/Preview-test.js
@@ -1789,14 +1789,6 @@ describe('lib/Preview', () => {
             expect(preview.ui.finishProgressBar).to.be.called;
         });
 
-        it('should navigate right on mediaendautoplay event', () => {
-            sandbox.stub(preview, 'navigateRight');
-            const data = { event: VIEWER_EVENT.mediaEndAutoplay };
-
-            preview.handleViewerEvents(data);
-            expect(preview.navigateRight).to.be.called;
-        });
-
         it('should emit viewerevent when event does not match', () => {
             sandbox.stub(preview, 'emit');
             const data = {