diff --git a/bigbluebutton-html5/imports/ui/components/video-provider/service.js b/bigbluebutton-html5/imports/ui/components/video-provider/service.js
index 7d74dd9a19f02f6c69e7e9f973506bd96ee532d6..3e6eb06f82f7dc774df460ad14906ca9e58e7b78 100755
--- a/bigbluebutton-html5/imports/ui/components/video-provider/service.js
+++ b/bigbluebutton-html5/imports/ui/components/video-provider/service.js
@@ -209,21 +209,31 @@ class VideoService {
   }
 
   calculateNextPage () {
+    if (this.numberOfPages === 0) {
+      return 0;
+    }
+
     return ((this.currentVideoPageIndex + 1) % this.numberOfPages + this.numberOfPages) % this.numberOfPages;
   }
 
   calculatePreviousPage () {
+    if (this.numberOfPages === 0) {
+      return 0;
+    }
+
     return ((this.currentVideoPageIndex - 1) % this.numberOfPages + this.numberOfPages) % this.numberOfPages;
   }
 
   getNextVideoPage() {
-    this.setCurrentVideoPageIndex(this.calculateNextPage());
+    const nextPage = this.calculateNextPage();
+    this.setCurrentVideoPageIndex(nextPage);
 
     return this.currentVideoPageIndex;
   }
 
   getPreviousVideoPage() {
-    this.setCurrentVideoPageIndex(this.calculatePreviousPage());
+    const previousPage = this.calculatePreviousPage();
+    this.setCurrentVideoPageIndex(previousPage);
 
     return this.currentVideoPageIndex;
   }