diff --git a/deps/media-playback/media-playback/media.c b/deps/media-playback/media-playback/media.c
index 7b91f4990..3beaa0cf1 100644
--- a/deps/media-playback/media-playback/media.c
+++ b/deps/media-playback/media-playback/media.c
@@ -583,6 +583,9 @@ static bool init_avformat(mp_media_t *m)
 		av_dict_set_int(&opts, "buffer_size", m->buffering, 0);
 
 	m->fmt = avformat_alloc_context();
+	if (m->buffering == 0) {
+		m->fmt->flags |= AVFMT_FLAG_NOBUFFER;
+	}
 	if (!m->is_local_file) {
 		m->fmt->interrupt_callback.callback = interrupt_callback;
 		m->fmt->interrupt_callback.opaque = m;
diff --git a/plugins/obs-ffmpeg/obs-ffmpeg-source.c b/plugins/obs-ffmpeg/obs-ffmpeg-source.c
index 2fa19c949..35925dbab 100644
--- a/plugins/obs-ffmpeg/obs-ffmpeg-source.c
+++ b/plugins/obs-ffmpeg/obs-ffmpeg-source.c
@@ -163,7 +163,7 @@ static obs_properties_t *ffmpeg_source_getproperties(void *data)
 				obs_module_text("RestartWhenActivated"));
 
 	prop = obs_properties_add_int_slider(props, "buffering_mb",
-					     obs_module_text("BufferingMB"), 1,
+					     obs_module_text("BufferingMB"), 0,
 					     16, 1);
 	obs_property_int_set_suffix(prop, " MB");