diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
index 6ede1dc5..8ec5d1e5 100644
--- a/src/components/timeline/timeline.js
+++ b/src/components/timeline/timeline.js
@@ -43,8 +43,8 @@ const Timeline = {
     filteredVisibleStatuses () {
       return this.timeline.visibleStatuses.filter(status => this.timelineName !== 'user' || (status.id >= this.timeline.minId && status.id <= this.timeline.maxId))
     },
-    filteredPinnedStatusesId () {
-      return this.pinnedStatusIds.filter(statusId => this.timeline.statusesObject[statusId])
+    filteredPinnedStatusIds () {
+      return (this.pinnedStatusIds || []).filter(statusId => this.timeline.statusesObject[statusId])
     },
     newStatusCount () {
       return this.timeline.newStatusCount
diff --git a/src/directives/body_scroll_lock.js b/src/directives/body_scroll_lock.js
index 13a6de1c..f5cc2247 100644
--- a/src/directives/body_scroll_lock.js
+++ b/src/directives/body_scroll_lock.js
@@ -50,7 +50,7 @@ const enableBodyScroll = (el) => {
 }
 
 const directive = {
-  inserted: (el, binding) => {
+  mounted: (el, binding) => {
     if (binding.value) {
       disableBodyScroll(el)
     }