diff --git a/app/src/main/java/org/mosad/teapod/parser/AoDParser.kt b/app/src/main/java/org/mosad/teapod/parser/AoDParser.kt
index 2a0890b..40b8bab 100644
--- a/app/src/main/java/org/mosad/teapod/parser/AoDParser.kt
+++ b/app/src/main/java/org/mosad/teapod/parser/AoDParser.kt
@@ -119,6 +119,11 @@ class AoDParser {
             return@runBlocking listOf()
         }
 
+        // if the episodes list is not empty it was loaded before
+        if (media.episodes.isNotEmpty()) {
+            return@runBlocking media.episodes
+        }
+
         withContext(Dispatchers.Default) {
 
             val res = Jsoup.connect(baseUrl + media.link)
diff --git a/app/src/main/java/org/mosad/teapod/util/DataTypes.kt b/app/src/main/java/org/mosad/teapod/util/DataTypes.kt
index 27e0435..e6390ae 100644
--- a/app/src/main/java/org/mosad/teapod/util/DataTypes.kt
+++ b/app/src/main/java/org/mosad/teapod/util/DataTypes.kt
@@ -8,7 +8,14 @@ class DataTypes {
     }
 }
 
-data class Media(val title: String, val link: String, val type: DataTypes.MediaType, val info : Info = Info(), var episodes: List<Episode> = listOf()) {
+// TODO the episodes workflow could use a clean up/rework
+data class Media(
+    val title: String,
+    val link: String,
+    val type: DataTypes.MediaType,
+    val info: Info = Info(),
+    var episodes: List<Episode> = listOf()
+) {
     override fun toString(): String {
         return title
     }