diff --git a/compose/cli/log_printer.py b/compose/cli/log_printer.py
index ce7e10653..9c5d35e18 100644
--- a/compose/cli/log_printer.py
+++ b/compose/cli/log_printer.py
@@ -4,7 +4,7 @@ import sys
 
 from itertools import cycle
 
-from .multiplexer import Multiplexer, STOP
+from .multiplexer import Multiplexer
 from . import colors
 from .utils import split_buffer
 
@@ -61,7 +61,6 @@ class LogPrinter(object):
 
         exit_code = container.wait()
         yield color_fn("%s exited with code %s\n" % (container.name, exit_code))
-        yield STOP
 
     def _generate_prefix(self, container):
         """
diff --git a/compose/cli/multiplexer.py b/compose/cli/multiplexer.py
index 02e39aa1e..ab7482e1d 100644
--- a/compose/cli/multiplexer.py
+++ b/compose/cli/multiplexer.py
@@ -45,3 +45,5 @@ class Multiplexer(object):
 def _enqueue_output(iterator, queue):
     for item in iterator:
         queue.put(item)
+
+    queue.put(STOP)