diff --git a/resources/assets/js/components/Timeline.vue b/resources/assets/js/components/Timeline.vue
index c7a27dd0f..54748b52d 100644
--- a/resources/assets/js/components/Timeline.vue
+++ b/resources/assets/js/components/Timeline.vue
@@ -229,7 +229,7 @@
 						<div class="card-body">
 							<infinite-loading @infinite="infiniteTimeline" :distance="800">
 							<div slot="no-more" class="font-weight-bold">No more posts to load</div>
-							<div slot="no-results" class="font-weight-bold">No posts found</div>
+							<div slot="no-results" class="font-weight-bold">No more posts to load</div>
 							</infinite-loading>
 						</div>
 					</div>
@@ -725,6 +725,9 @@
 					} else {
 						$state.complete();
 					}
+				}).catch(err => {
+					this.loading = false;
+					$state.complete();
 				});
 			},