diff --git a/app/src/main/java/com/github/apognu/otter/fragments/FunkwhaleFragment.kt b/app/src/main/java/com/github/apognu/otter/fragments/FunkwhaleFragment.kt
index 12f2b9b..2de5ab0 100644
--- a/app/src/main/java/com/github/apognu/otter/fragments/FunkwhaleFragment.kt
+++ b/app/src/main/java/com/github/apognu/otter/fragments/FunkwhaleFragment.kt
@@ -10,10 +10,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.github.apognu.otter.repositories.HttpUpstream
 import com.github.apognu.otter.repositories.Repository
-import com.github.apognu.otter.utils.Cache
-import com.github.apognu.otter.utils.Event
-import com.github.apognu.otter.utils.EventBus
-import com.github.apognu.otter.utils.untilNetwork
+import com.github.apognu.otter.utils.*
 import com.google.gson.Gson
 import kotlinx.android.synthetic.main.fragment_artists.*
 import kotlinx.coroutines.Dispatchers.IO
@@ -105,6 +102,10 @@ abstract class FunkwhaleFragment<D : Any, A : FunkwhaleAdapter<D, *>> : Fragment
     }
 
     repository.fetch(upstreams, size).untilNetwork(lifecycleScope, IO) { data, isCache, page, hasMore ->
+      if (isCache && data.isEmpty()) {
+        fetch(Repository.Origin.Network.origin)
+      }
+
       lifecycleScope.launch(Main) {
         if (isCache) {
           adapter.data = data.toMutableList()
diff --git a/app/src/main/java/com/github/apognu/otter/repositories/Repository.kt b/app/src/main/java/com/github/apognu/otter/repositories/Repository.kt
index 9ce30a7..290a906 100644
--- a/app/src/main/java/com/github/apognu/otter/repositories/Repository.kt
+++ b/app/src/main/java/com/github/apognu/otter/repositories/Repository.kt
@@ -41,9 +41,11 @@ abstract class Repository<D : Any, C : CacheItem<D>> {
     cacheId?.let { cacheId ->
       Cache.get(context, cacheId)?.let { reader ->
         uncache(reader)?.let { cache ->
-          emit(Response(Origin.Cache, cache.data, ceil(cache.data.size / AppContext.PAGE_SIZE.toDouble()).toInt(), false))
+          return@flow emit(Response(Origin.Cache, cache.data, ceil(cache.data.size / AppContext.PAGE_SIZE.toDouble()).toInt(), false))
         }
       }
+
+      return@flow emit(Response(Origin.Cache, listOf(), 1, false))
     }
   }.flowOn(IO)