diff --git a/src/log_format_impls.cc b/src/log_format_impls.cc
index 6b4caa99ba..3c8371e7c4 100644
--- a/src/log_format_impls.cc
+++ b/src/log_format_impls.cc
@@ -123,8 +123,9 @@ class piper_log_format : public log_format {
         const auto prefix_len = this->plf_cached_line.size();
         this->plf_cached_line.resize(this->plf_cached_line.size()
                                      + sbr.length());
-        memcpy(
-            &this->plf_cached_line[prefix_len], sbr.get_data(), sbr.length());
+        memcpy(this->plf_cached_line.data() + prefix_len,
+               sbr.get_data(),
+               sbr.length());
 
         sbr.share(this->plf_share_manager,
                   this->plf_cached_line.data(),
diff --git a/test/Makefile.am b/test/Makefile.am
index 2bccff7da2..ecae9447f8 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -363,6 +363,7 @@ dist_noinst_DATA = \
 	logfile_cloudflare.1 \
 	logfile_cxx.0 \
 	logfile_docker_compose.0 \
+	logfile_docker_compose_empty_body.0 \
 	logfile_docker_compose_with_noise.0 \
 	logfile_docker_compose_with_ts.0 \
 	logfile_dst.0 \
diff --git a/test/expected/test_demux.sh_83e339125bf0af442ee46a6f498cb750cda01d5f.err b/test/expected/test_demux.sh_83e339125bf0af442ee46a6f498cb750cda01d5f.err
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/test/expected/test_demux.sh_83e339125bf0af442ee46a6f498cb750cda01d5f.out b/test/expected/test_demux.sh_83e339125bf0af442ee46a6f498cb750cda01d5f.out
new file mode 100644
index 0000000000..8fbc490ce5
--- /dev/null
+++ b/test/expected/test_demux.sh_83e339125bf0af442ee46a6f498cb750cda01d5f.out
@@ -0,0 +1,2 @@
+2013-06-06T19:13:20.123456+0000 
+2013-06-06T19:13:20.123456+0000 hello
diff --git a/test/logfile_docker_compose_empty_body.0 b/test/logfile_docker_compose_empty_body.0
new file mode 100644
index 0000000000..a6a8a2592e
--- /dev/null
+++ b/test/logfile_docker_compose_empty_body.0
@@ -0,0 +1,2 @@
+db-1  | 
+db-1  | hello
diff --git a/test/test_demux.sh b/test/test_demux.sh
index 0227030a9c..c37024ca5f 100644
--- a/test/test_demux.sh
+++ b/test/test_demux.sh
@@ -19,6 +19,9 @@ cat ${test_dir}/logfile_docker_compose_with_ts.0 | run_cap_test env TEST_COMMENT
 
 run_cap_test ${lnav_test} -n ${test_dir}/logfile_docker_compose_with_ts.0
 
+# The first message has an empty body
+run_cap_test ${lnav_test} -n ${test_dir}/logfile_docker_compose_empty_body.0
+
 run_cap_test ${lnav_test} -n ${test_dir}/logfile_mux_zookeeper.0
 
 run_cap_test ${lnav_test} -n \