diff --git a/src/renderer/components/SubscriptionsLive.vue b/src/renderer/components/SubscriptionsLive.vue
index 4bea31baf8386..0465bf8ca63c3 100644
--- a/src/renderer/components/SubscriptionsLive.vue
+++ b/src/renderer/components/SubscriptionsLive.vue
@@ -237,7 +237,12 @@ async function loadVideosForSubscriptionsFromRemote() {
       })
     }
 
-    return videos ?? []
+    if (videos == null) {
+      const cachedEntry = store.getters.getLiveCache[channel.id]
+      return cachedEntry?.videos ?? []
+    }
+
+    return videos
   }))).flat()
 
   videoList.value = updateVideoListAfterProcessing(videoListFromRemote)
diff --git a/src/renderer/components/SubscriptionsShorts.vue b/src/renderer/components/SubscriptionsShorts.vue
index b31403273e7f4..d1e3a7f1141dd 100644
--- a/src/renderer/components/SubscriptionsShorts.vue
+++ b/src/renderer/components/SubscriptionsShorts.vue
@@ -213,7 +213,12 @@ async function loadVideosForSubscriptionsFromRemote() {
       })
     }
 
-    return videos ?? []
+    if (videos == null) {
+      const cachedEntry = store.getters.getShortsCache[channel.id]
+      return cachedEntry?.videos ?? []
+    }
+
+    return videos
   }))).flat()
 
   videoList.value = updateVideoListAfterProcessing(videoListFromRemote)
diff --git a/src/renderer/components/SubscriptionsVideos.vue b/src/renderer/components/SubscriptionsVideos.vue
index 049a1741a07fd..5619fca2252a8 100644
--- a/src/renderer/components/SubscriptionsVideos.vue
+++ b/src/renderer/components/SubscriptionsVideos.vue
@@ -236,7 +236,12 @@ async function loadVideosForSubscriptionsFromRemote() {
       })
     }
 
-    return videos ?? []
+    if (videos == null) {
+      const cachedEntry = store.getters.getVideoCache[channel.id]
+      return cachedEntry?.videos ?? []
+    }
+
+    return videos
   }))).flat()
 
   videoList.value = updateVideoListAfterProcessing(videoListFromRemote)