diff --git a/CHANGES b/CHANGES
index 4060f6dc2..e32b2293f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -37,6 +37,7 @@ Other fixes:
  - Qt: Fix a race condition in the frame inspector
  - Qt: Add dummy English translation file (fixes mgba.io/i/1469)
  - mGUI: Fix closing down a game if an exit is signalled
+ - mVL: Fix injecting accidentally draining non-injection buffer
  - SM83: Simplify register pair access on big endian
  - VFS: Fix directory node listing on some filesystems
 Misc:
diff --git a/cinema/gb/window/ccmmr-hud/baseline_0004.png b/cinema/gb/window/ccmmr-hud/baseline_0004.png
new file mode 100644
index 000000000..d800d8522
Binary files /dev/null and b/cinema/gb/window/ccmmr-hud/baseline_0004.png differ
diff --git a/cinema/gb/window/ccmmr-hud/baseline_0005.png b/cinema/gb/window/ccmmr-hud/baseline_0005.png
new file mode 100644
index 000000000..e2ee6d7fb
Binary files /dev/null and b/cinema/gb/window/ccmmr-hud/baseline_0005.png differ
diff --git a/cinema/gb/window/rfs-hud/baseline_0001.png b/cinema/gb/window/rfs-hud/baseline_0001.png
new file mode 100644
index 000000000..786d59430
Binary files /dev/null and b/cinema/gb/window/rfs-hud/baseline_0001.png differ
diff --git a/cinema/gb/window/rfs-hud/baseline_0002.png b/cinema/gb/window/rfs-hud/baseline_0002.png
new file mode 100644
index 000000000..d04f46f5a
Binary files /dev/null and b/cinema/gb/window/rfs-hud/baseline_0002.png differ
diff --git a/cinema/gb/window/rfs-hud/baseline_0003.png b/cinema/gb/window/rfs-hud/baseline_0003.png
new file mode 100644
index 000000000..d04f46f5a
Binary files /dev/null and b/cinema/gb/window/rfs-hud/baseline_0003.png differ
diff --git a/cinema/gb/window/rfs-hud/baseline_0004.png b/cinema/gb/window/rfs-hud/baseline_0004.png
new file mode 100644
index 000000000..d04f46f5a
Binary files /dev/null and b/cinema/gb/window/rfs-hud/baseline_0004.png differ
diff --git a/cinema/gb/window/rfs-hud/baseline_0005.png b/cinema/gb/window/rfs-hud/baseline_0005.png
new file mode 100644
index 000000000..d04f46f5a
Binary files /dev/null and b/cinema/gb/window/rfs-hud/baseline_0005.png differ
diff --git a/cinema/gb/window/rfs-hud/baseline_0006.png b/cinema/gb/window/rfs-hud/baseline_0006.png
new file mode 100644
index 000000000..5ed5aeead
Binary files /dev/null and b/cinema/gb/window/rfs-hud/baseline_0006.png differ
diff --git a/cinema/gb/window/rfs-hud/baseline_0007.png b/cinema/gb/window/rfs-hud/baseline_0007.png
new file mode 100644
index 000000000..5ed5aeead
Binary files /dev/null and b/cinema/gb/window/rfs-hud/baseline_0007.png differ
diff --git a/cinema/gb/window/rfs-hud/baseline_0008.png b/cinema/gb/window/rfs-hud/baseline_0008.png
new file mode 100644
index 000000000..5ed5aeead
Binary files /dev/null and b/cinema/gb/window/rfs-hud/baseline_0008.png differ
diff --git a/cinema/gb/window/rfs-hud/baseline_0009.png b/cinema/gb/window/rfs-hud/baseline_0009.png
new file mode 100644
index 000000000..5ed5aeead
Binary files /dev/null and b/cinema/gb/window/rfs-hud/baseline_0009.png differ
diff --git a/cinema/gb/window/rfs-hud/baseline_0010.png b/cinema/gb/window/rfs-hud/baseline_0010.png
new file mode 100644
index 000000000..72377bc9d
Binary files /dev/null and b/cinema/gb/window/rfs-hud/baseline_0010.png differ
diff --git a/cinema/gb/window/rfs-hud/baseline_0011.png b/cinema/gb/window/rfs-hud/baseline_0011.png
new file mode 100644
index 000000000..72377bc9d
Binary files /dev/null and b/cinema/gb/window/rfs-hud/baseline_0011.png differ
diff --git a/cinema/gb/window/rfs-hud/baseline_0012.png b/cinema/gb/window/rfs-hud/baseline_0012.png
new file mode 100644
index 000000000..72377bc9d
Binary files /dev/null and b/cinema/gb/window/rfs-hud/baseline_0012.png differ
diff --git a/cinema/gb/window/rfs-hud/baseline_0013.png b/cinema/gb/window/rfs-hud/baseline_0013.png
new file mode 100644
index 000000000..72377bc9d
Binary files /dev/null and b/cinema/gb/window/rfs-hud/baseline_0013.png differ
diff --git a/cinema/gb/window/rfs-hud/baseline_0014.png b/cinema/gb/window/rfs-hud/baseline_0014.png
new file mode 100644
index 000000000..63e664404
Binary files /dev/null and b/cinema/gb/window/rfs-hud/baseline_0014.png differ
diff --git a/cinema/gb/window/wmm-hud/baseline_0001.png b/cinema/gb/window/wmm-hud/baseline_0001.png
index 73af7e9c5..aa096df25 100644
Binary files a/cinema/gb/window/wmm-hud/baseline_0001.png and b/cinema/gb/window/wmm-hud/baseline_0001.png differ
diff --git a/cinema/gb/window/wmm-hud/baseline_0002.png b/cinema/gb/window/wmm-hud/baseline_0002.png
index 73af7e9c5..aa096df25 100644
Binary files a/cinema/gb/window/wmm-hud/baseline_0002.png and b/cinema/gb/window/wmm-hud/baseline_0002.png differ
diff --git a/cinema/gb/window/wmm-hud/baseline_0003.png b/cinema/gb/window/wmm-hud/baseline_0003.png
index 497008dbb..31f6ea259 100644
Binary files a/cinema/gb/window/wmm-hud/baseline_0003.png and b/cinema/gb/window/wmm-hud/baseline_0003.png differ
diff --git a/cinema/gb/window/wmm-hud/baseline_0004.png b/cinema/gb/window/wmm-hud/baseline_0004.png
index 497008dbb..31f6ea259 100644
Binary files a/cinema/gb/window/wmm-hud/baseline_0004.png and b/cinema/gb/window/wmm-hud/baseline_0004.png differ
diff --git a/cinema/gb/window/wmm-hud/baseline_0005.png b/cinema/gb/window/wmm-hud/baseline_0005.png
index 497008dbb..31f6ea259 100644
Binary files a/cinema/gb/window/wmm-hud/baseline_0005.png and b/cinema/gb/window/wmm-hud/baseline_0005.png differ
diff --git a/cinema/gb/window/wmm-hud/baseline_0006.png b/cinema/gb/window/wmm-hud/baseline_0006.png
index 497008dbb..31f6ea259 100644
Binary files a/cinema/gb/window/wmm-hud/baseline_0006.png and b/cinema/gb/window/wmm-hud/baseline_0006.png differ
diff --git a/cinema/gb/window/wmm-hud/baseline_0007.png b/cinema/gb/window/wmm-hud/baseline_0007.png
index 497008dbb..31f6ea259 100644
Binary files a/cinema/gb/window/wmm-hud/baseline_0007.png and b/cinema/gb/window/wmm-hud/baseline_0007.png differ
diff --git a/cinema/gba/obj/unaligned-256-linear/baseline_0004.png b/cinema/gba/obj/unaligned-256-linear/baseline_0004.png
index 5f20a6405..52ea42a96 100644
Binary files a/cinema/gba/obj/unaligned-256-linear/baseline_0004.png and b/cinema/gba/obj/unaligned-256-linear/baseline_0004.png differ
diff --git a/cinema/gba/obj/unaligned-256-linear/baseline_0005.png b/cinema/gba/obj/unaligned-256-linear/baseline_0005.png
index ab9305096..82cc61aef 100644
Binary files a/cinema/gba/obj/unaligned-256-linear/baseline_0005.png and b/cinema/gba/obj/unaligned-256-linear/baseline_0005.png differ
diff --git a/src/feature/video-logger.c b/src/feature/video-logger.c
index b0e3f470b..cd738f75b 100644
--- a/src/feature/video-logger.c
+++ b/src/feature/video-logger.c
@@ -1000,7 +1000,7 @@ static ssize_t mVideoLoggerReadChannel(struct mVideoLogChannel* channel, void* d
 		data = (uint8_t*) data + size;
 		length -= size;
 	}
-	if (!_fillBuffer(context, channelId, BUFFER_BASE_SIZE)) {
+	if (channel->injecting || !_fillBuffer(context, channelId, BUFFER_BASE_SIZE)) {
 		return size;
 	}
 	size += CircleBufferRead(buffer, data, length);