diff --git a/src/zm_videostore.cpp b/src/zm_videostore.cpp
index ff3a99851..f0d67468d 100644
--- a/src/zm_videostore.cpp
+++ b/src/zm_videostore.cpp
@@ -149,12 +149,12 @@ bool VideoStore::open() {
     const AVDictionaryEntry *entry = av_dict_get(opts, "reorder_queue_size", nullptr, AV_DICT_MATCH_CASE);
     if (entry) {
       reorder_queue_size = std::stoul(entry->value);
-      Debug(1, "reorder_queue_size set to %zu", reorder_queue_size);
       // remove it to prevent complaining later.
       av_dict_set(&opts, "reorder_queue_size", nullptr, AV_DICT_MATCH_CASE);
-    } else {
+    } else if (monitor->has_out_of_order_packets()) {
       reorder_queue_size = monitor->get_max_keyframe_interval();
     }
+    Debug(1, "reorder_queue_size set to %zu", reorder_queue_size);
   }
 
   oc->metadata = pmetadata;