diff --git a/webui/src/views/HomeView.vue b/webui/src/views/HomeView.vue
index 6929e3f..fb4e2ec 100644
--- a/webui/src/views/HomeView.vue
+++ b/webui/src/views/HomeView.vue
@@ -32,7 +32,7 @@ export default {
 				return
 			}
 
-			if (response.data.length == 0) this.data_ended = true;
+			if (response.data.length == 0 || response.data.length < this.limit) this.data_ended = true;
 			else this.stream_data = this.stream_data.concat(response.data);
 			this.loading = false;
 		},
diff --git a/webui/src/views/ProfileView.vue b/webui/src/views/ProfileView.vue
index 9a42b59..a25f085 100644
--- a/webui/src/views/ProfileView.vue
+++ b/webui/src/views/ProfileView.vue
@@ -49,7 +49,7 @@ export default {
 				return
 			}
 
-			if (response.data.length == 0) this.data_ended = true;
+			if (response.data.length == 0 || response.data.length < this.limit) this.data_ended = true;
 			else this.stream_data = this.stream_data.concat(response.data);
 			this.loading = false;
 
@@ -61,7 +61,7 @@ export default {
 		scroll() {
 			window.onscroll = () => {
 				let bottomOfWindow = Math.max(window.pageYOffset, document.documentElement.scrollTop, document.body.scrollTop) + window.innerHeight >= document.documentElement.offsetHeight - 5
-				
+
 				if (bottomOfWindow && !this.data_ended) {
 					this.start_idx += this.limit
 					this.loadMore()
diff --git a/webui/src/views/SearchView.vue b/webui/src/views/SearchView.vue
index 63bc581..77b1253 100644
--- a/webui/src/views/SearchView.vue
+++ b/webui/src/views/SearchView.vue
@@ -39,10 +39,10 @@ export default {
 		},
 		scroll () {
 			window.onscroll = () => {
-				let bottomOfWindow = Math.max(window.pageYOffset, document.documentElement.scrollTop, document.body.scrollTop) + window.innerHeight === document.documentElement.offsetHeight
+				let bottomOfWindow = Math.max(window.pageYOffset, document.documentElement.scrollTop, document.body.scrollTop) + window.innerHeight >= document.documentElement.offsetHeight - 5
 				if (bottomOfWindow && !this.dataEnded) {
-					this.startIdx += this.limit;
-					this.loadContent();
+					this.startIdx += this.limit
+					this.loadContent()
 				}
 			}
 		},