diff --git a/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/ReaderEnv.kt b/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/ReaderEnv.kt
index 63d18a33..2b6c8561 100644
--- a/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/ReaderEnv.kt
+++ b/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/ReaderEnv.kt
@@ -4,6 +4,7 @@ import java.io.File
 
 class ReaderEnv {
     companion object {
+        val metadataTimeOut: Long = System.getenv("TIMEOUT_READER_WAIT_FOR_METADATA").toLongOrNull() ?: 300000
         val ffprobe: String = System.getenv("SUPPORTING_EXECUTABLE_FFPROBE") ?: "ffprobe"
         val encodePreference: File = File("/data/config/preference.json")
     }
diff --git a/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/contentDeterminator/ContentDeterminate.kt b/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/contentDeterminator/ContentDeterminate.kt
index 489f08ce..3c0e3cee 100644
--- a/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/contentDeterminator/ContentDeterminate.kt
+++ b/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/contentDeterminator/ContentDeterminate.kt
@@ -10,6 +10,7 @@ import no.iktdev.streamit.content.common.dto.Metadata
 import no.iktdev.streamit.content.common.dto.reader.EpisodeInfo
 import no.iktdev.streamit.content.common.dto.reader.FileResult
 import no.iktdev.streamit.content.common.dto.reader.MovieInfo
+import no.iktdev.streamit.content.reader.ReaderEnv
 import no.iktdev.streamit.library.kafka.KafkaEvents
 import no.iktdev.streamit.library.kafka.dto.Message
 import no.iktdev.streamit.library.kafka.dto.Status
@@ -30,7 +31,8 @@ class ContentDeterminate: DefaultKafkaReader("contentDeterminate"), ISequentialM
         accept = KafkaEvents.EVENT_READER_RECEIVED_FILE.event,
         subAccepts = listOf(KafkaEvents.EVENT_METADATA_OBTAINED.event),
         deserializers = loadDeserializers(),
-        listener = this
+        listener = this,
+        validity = ReaderEnv.metadataTimeOut
     ) {}
 
     init {
diff --git a/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/fileWatcher/FileWatcher.kt b/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/fileWatcher/FileWatcher.kt
index c4ff099a..cbd07cb1 100644
--- a/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/fileWatcher/FileWatcher.kt
+++ b/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/fileWatcher/FileWatcher.kt
@@ -47,7 +47,7 @@ class FileWatcher: FileWatcherEvents {
                             logger.warn { "${it.file.name} is not a valid file type" }
                         } else if (it.file.isDirectory) {
                             val valid = it.file.walkTopDown().filter { f -> f.isFile && f.extension in validVideoFiles() }
-                            logger.warn { "${it.file.name} ignoring directory" }
+                            logger.warn { "Ignoring directory: ${it.file.name}" }
                         }
                     }