diff --git a/kolibri/plugins/coach/assets/src/modules/lessonResources/handlers.js b/kolibri/plugins/coach/assets/src/modules/lessonResources/handlers.js
index 8439c17f7b6..c2c386832ee 100644
--- a/kolibri/plugins/coach/assets/src/modules/lessonResources/handlers.js
+++ b/kolibri/plugins/coach/assets/src/modules/lessonResources/handlers.js
@@ -164,10 +164,11 @@ export function showLessonResourceBookmarks(store, params) {
     });
   });
 }
-export function showLessonResourceBookmarksMain(store) {
+export function showLessonResourceBookmarksMain(store, params) {
   return store.dispatch('loading').then(() => {
     getBookmarks().then(bookmarks => {
       return showResourceSelectionPage(store, {
+        lessonId: params.lessonId,
         bookmarksList: bookmarks[0],
       });
     });
diff --git a/kolibri/plugins/coach/assets/src/views/plan/LessonResourceSelectionPage/index.vue b/kolibri/plugins/coach/assets/src/views/plan/LessonResourceSelectionPage/index.vue
index ba8d571c77b..f613a426642 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/LessonResourceSelectionPage/index.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/LessonResourceSelectionPage/index.vue
@@ -388,7 +388,8 @@
         }
       },
       addToSelectedResources(content) {
-        const list = this.contentList.length ? this.contentList : this.bookmarksList;
+        const list =
+          this.contentList && this.contentList.length ? this.contentList : this.bookmarksList;
         this.addToResourceCache({
           node: list.find(n => n.id === content.id),
         });