diff --git a/src/WriterPipeline.h b/src/WriterPipeline.h
index 374f45b..d01fa7a 100644
--- a/src/WriterPipeline.h
+++ b/src/WriterPipeline.h
@@ -50,7 +50,7 @@ struct WriterPipeline {
                         shutdownRequested = true;
                         writerInbox.push_move({});
                         shutdownCv.notify_all();
-                        break;
+                        return;
                     }
 
                     std::string flatStr;
@@ -143,6 +143,7 @@ struct WriterPipeline {
                 if (shutdownComplete) {
                     flushInbox.push_move(true);
                     if (numLive != 0) LW << "numLive was not 0 after shutdown!";
+                    return;
                 }
 
                 backpressureCv.notify_all();