diff --git a/src/output/output_cmaf.cpp b/src/output/output_cmaf.cpp
index 756fceb8..4582a8b6 100644
--- a/src/output/output_cmaf.cpp
+++ b/src/output/output_cmaf.cpp
@@ -284,7 +284,7 @@ namespace Mist{
         requestTid,
         M.biggestFragment(timingTid) / 1000,
         atol(H.GetVar("iMsn").c_str()),
-        config->getInteger("listlimit"),
+        M.getLive()? config->getInteger("listlimit") : 0,
         urlPrefix,
         systemBoot,
         bootMsOffset,
diff --git a/src/output/output_hls.cpp b/src/output/output_hls.cpp
index 93410f54..19d083e6 100644
--- a/src/output/output_hls.cpp
+++ b/src/output/output_hls.cpp
@@ -173,7 +173,7 @@ namespace Mist{
         requestTid,
         M.biggestFragment(timingTid) / 1000,
         atol(H.GetVar("iMsn").c_str()),
-        config->getInteger("listlimit"),
+        M.getLive()? config->getInteger("listlimit") : 0,
         urlPrefix,
         systemBoot,
         bootMsOffset,