diff --git a/src/components/FeedTimelineView.svelte b/src/components/FeedTimelineView.svelte
index 054c022..4f38bf7 100644
--- a/src/components/FeedTimelineView.svelte
+++ b/src/components/FeedTimelineView.svelte
@@ -120,9 +120,9 @@
 		} catch (error) {
 			loadError = `${error}`;
 			loaderState.error();
+		} finally {
+			loading = false;
 		}
-
-		loading = false;
 	};
 
 	$effect(() => {
diff --git a/src/components/GenericTimelineView.svelte b/src/components/GenericTimelineView.svelte
index 07e772a..f5f20f1 100644
--- a/src/components/GenericTimelineView.svelte
+++ b/src/components/GenericTimelineView.svelte
@@ -87,15 +87,13 @@
 		} catch (error) {
 			loadError = `${error}`;
 			loaderState.error();
+		} finally {
 			loading = false;
-			return;
 		}
-
-		loading = false;
 	};
 
 	$effect(() => {
-		const isEmpty = threads.length === 0;
+		const isEmpty = threads.length < 15;
 		if (isEmpty && !loading && shouldLoad && !isComplete) loadMore();
 	});
 </script>