diff --git a/src/renderer/components/TimelineSpace/Contents/Public.vue b/src/renderer/components/TimelineSpace/Contents/Public.vue
index 9bee9d24..a8e6e8f7 100644
--- a/src/renderer/components/TimelineSpace/Contents/Public.vue
+++ b/src/renderer/components/TimelineSpace/Contents/Public.vue
@@ -70,6 +70,12 @@ export default {
     onScroll (event) {
       if (((event.target.clientHeight + event.target.scrollTop) >= document.getElementById('public').clientHeight - 10) && !this.lazyloading) {
         this.$store.dispatch('TimelineSpace/Contents/Public/lazyFetchTimeline', this.timeline[this.timeline.length - 1])
+          .catch(() => {
+            this.$message({
+              message: 'Could not fetch timeline',
+              type: 'error'
+            })
+          })
       }
     }
   }
diff --git a/src/renderer/store/TimelineSpace/Contents/Public.js b/src/renderer/store/TimelineSpace/Contents/Public.js
index 6e583b79..7f19d98c 100644
--- a/src/renderer/store/TimelineSpace/Contents/Public.js
+++ b/src/renderer/store/TimelineSpace/Contents/Public.js
@@ -70,6 +70,9 @@ const Public = {
       ipcRenderer.send('stop-public-streaming')
     },
     lazyFetchTimeline ({ state, commit, rootState }, last) {
+      if (last === undefined || last === null) {
+        return null
+      }
       return new Promise((resolve, reject) => {
         if (state.lazyLoading) {
           return resolve()