diff --git a/src/components/ChannelPage.vue b/src/components/ChannelPage.vue
index 7bb35b35..46d161f9 100644
--- a/src/components/ChannelPage.vue
+++ b/src/components/ChannelPage.vue
@@ -1,7 +1,7 @@
 <template>
     <ErrorHandler v-if="channel && channel.error" :message="channel.message" :error="channel.error" />
 
-    <div v-if="channel" v-show="!channel.error">
+    <LoadingIndicatorPage :show-content="channel != null && !channel.error">
         <div class="flex justify-center place-items-center">
             <img height="48" width="48" class="rounded-full m-1" :src="channel.avatarUrl" />
             <h1 v-text="channel.name" />
@@ -61,24 +61,21 @@
                 hide-channel
             />
         </div>
-    </div>
-    <div v-else>
-        <LoadingIndicator />
-    </div>
+    </LoadingIndicatorPage>
 </template>
 
 <script>
 import ErrorHandler from "./ErrorHandler.vue";
 import ContentItem from "./ContentItem.vue";
 import WatchOnYouTubeButton from "./WatchOnYouTubeButton.vue";
-import LoadingIndicator from "./LoadingIndicator.vue";
+import LoadingIndicatorPage from "./LoadingIndicatorPage.vue";
 
 export default {
     components: {
         ErrorHandler,
         ContentItem,
         WatchOnYouTubeButton,
-        LoadingIndicator,
+        LoadingIndicatorPage,
     },
     data() {
         return {
diff --git a/src/components/FeedPage.vue b/src/components/FeedPage.vue
index 7f2b99e9..36749650 100644
--- a/src/components/FeedPage.vue
+++ b/src/components/FeedPage.vue
@@ -24,32 +24,29 @@
 
     <hr />
 
-    <div v-if="videos.length != 0" class="video-grid">
+    <LoadingIndicatorPage :show-content="videosStore != null" class="video-grid">
         <template v-for="video in videos" :key="video.url">
             <VideoItem v-if="shouldShowVideo(video)" :is-feed="true" :item="video" />
         </template>
-    </div>
-    <div v-else>
-        <LoadingIndicator />
-    </div>
+    </LoadingIndicatorPage>
 </template>
 
 <script>
 import VideoItem from "./VideoItem.vue";
 import SortingSelector from "./SortingSelector.vue";
-import LoadingIndicator from "./LoadingIndicator.vue";
+import LoadingIndicatorPage from "./LoadingIndicatorPage.vue";
 
 export default {
     components: {
         VideoItem,
         SortingSelector,
-        LoadingIndicator,
+        LoadingIndicatorPage,
     },
     data() {
         return {
             currentVideoCount: 0,
             videoStep: 100,
-            videosStore: [],
+            videosStore: null,
             videos: [],
             availableFilters: ["all", "shorts", "videos"],
             selectedFilter: "all",
diff --git a/src/components/LoadingIndicator.vue b/src/components/LoadingIndicatorPage.vue
similarity index 67%
rename from src/components/LoadingIndicator.vue
rename to src/components/LoadingIndicatorPage.vue
index 40cdeb24..6336171e 100644
--- a/src/components/LoadingIndicator.vue
+++ b/src/components/LoadingIndicatorPage.vue
@@ -1,6 +1,9 @@
 <template>
-    <div class="flex min-h-[75vh] w-full justify-center items-center">
-        <span id="spinner"></span>
+    <div v-if="!showContent" class="flex min-h-[75vh] w-full justify-center items-center">
+        <span id="spinner" />
+    </div>
+    <div v-else>
+        <slot />
     </div>
 </template>
 
@@ -39,3 +42,14 @@
     }
 }
 </style>
+
+<script>
+export default {
+    props: {
+        showContent: {
+            type: Boolean,
+            required: true,
+        },
+    },
+};
+</script>
diff --git a/src/components/PlaylistPage.vue b/src/components/PlaylistPage.vue
index e58e74c9..7d468a00 100644
--- a/src/components/PlaylistPage.vue
+++ b/src/components/PlaylistPage.vue
@@ -1,7 +1,7 @@
 <template>
     <ErrorHandler v-if="playlist && playlist.error" :message="playlist.message" :error="playlist.error" />
 
-    <div v-if="playlist" v-show="!playlist.error">
+    <LoadingIndicatorPage :show-content="playlist" v-show="!playlist.error">
         <h1 class="text-center my-4" v-text="playlist.name" />
 
         <div class="flex justify-between items-center">
@@ -46,15 +46,12 @@
                 width="168"
             />
         </div>
-    </div>
-    <div v-else>
-        <LoadingIndicator />
-    </div>
+    </LoadingIndicatorPage>
 </template>
 
 <script>
 import ErrorHandler from "./ErrorHandler.vue";
-import LoadingIndicator from "./LoadingIndicator.vue";
+import LoadingIndicatorPage from "./LoadingIndicatorPage.vue";
 import VideoItem from "./VideoItem.vue";
 import WatchOnYouTubeButton from "./WatchOnYouTubeButton.vue";
 
@@ -63,7 +60,7 @@ export default {
         ErrorHandler,
         VideoItem,
         WatchOnYouTubeButton,
-        LoadingIndicator,
+        LoadingIndicatorPage,
     },
     data() {
         return {
diff --git a/src/components/SearchResults.vue b/src/components/SearchResults.vue
index 6f506d88..900517e0 100644
--- a/src/components/SearchResults.vue
+++ b/src/components/SearchResults.vue
@@ -18,24 +18,21 @@
         </i18n-t>
     </div>
 
-    <div v-if="results != null && results.items.length != 0" class="video-grid">
+    <LoadingIndicatorPage :show-content="results != null && results.items?.length" class="video-grid">
         <template v-for="result in results.items" :key="result.url">
             <ContentItem :item="result" height="94" width="168" />
         </template>
-    </div>
-    <div v-else>
-        <LoadingIndicator />
-    </div>
+    </LoadingIndicatorPage>
 </template>
 
 <script>
 import ContentItem from "./ContentItem.vue";
-import LoadingIndicator from "./LoadingIndicator.vue";
+import LoadingIndicatorPage from "./LoadingIndicatorPage.vue";
 
 export default {
     components: {
         ContentItem,
-        LoadingIndicator,
+        LoadingIndicatorPage,
     },
     data() {
         return {
diff --git a/src/components/TrendingPage.vue b/src/components/TrendingPage.vue
index 460b119b..34dfec23 100644
--- a/src/components/TrendingPage.vue
+++ b/src/components/TrendingPage.vue
@@ -3,22 +3,19 @@
 
     <hr />
 
-    <div v-if="videos.length != 0" class="video-grid">
+    <LoadingIndicatorPage :show-content="videos.length != 0" class="video-grid">
         <VideoItem v-for="video in videos" :key="video.url" :item="video" height="118" width="210" />
-    </div>
-    <div v-else>
-        <LoadingIndicator />
-    </div>
+    </LoadingIndicatorPage>
 </template>
 
 <script>
-import LoadingIndicator from "./LoadingIndicator.vue";
+import LoadingIndicatorPage from "./LoadingIndicatorPage.vue";
 import VideoItem from "./VideoItem.vue";
 
 export default {
     components: {
         VideoItem,
-        LoadingIndicator,
+        LoadingIndicatorPage,
     },
     data() {
         return {
diff --git a/src/components/WatchVideo.vue b/src/components/WatchVideo.vue
index 2512701b..34742bf6 100644
--- a/src/components/WatchVideo.vue
+++ b/src/components/WatchVideo.vue
@@ -12,7 +12,7 @@
         />
     </div>
 
-    <div v-if="video && !isEmbed" class="w-full">
+    <LoadingIndicatorPage :show-content="video && !isEmbed" class="w-full">
         <ErrorHandler v-if="video && video.error" :message="video.message" :error="video.error" />
 
         <div v-show="!video.error">
@@ -217,10 +217,7 @@
                 <hr class="sm:hidden" />
             </div>
         </div>
-    </div>
-    <div v-else>
-        <LoadingIndicator />
-    </div>
+    </LoadingIndicatorPage>
 </template>
 
 <script>
@@ -233,7 +230,7 @@ import PlaylistAddModal from "./PlaylistAddModal.vue";
 import ShareModal from "./ShareModal.vue";
 import PlaylistVideos from "./PlaylistVideos.vue";
 import WatchOnYouTubeButton from "./WatchOnYouTubeButton.vue";
-import LoadingIndicator from "./LoadingIndicator.vue";
+import LoadingIndicatorPage from "./LoadingIndicatorPage.vue";
 
 export default {
     name: "App",
@@ -247,7 +244,7 @@ export default {
         ShareModal,
         PlaylistVideos,
         WatchOnYouTubeButton,
-        LoadingIndicator,
+        LoadingIndicatorPage,
     },
     data() {
         const smallViewQuery = window.matchMedia("(max-width: 640px)");