diff --git a/fig/cli/log_printer.py b/fig/cli/log_printer.py
index f20ad88d1e..a3ad15eb3b 100644
--- a/fig/cli/log_printer.py
+++ b/fig/cli/log_printer.py
@@ -31,8 +31,9 @@ class LogPrinter(object):
 
     def _make_log_generator(self, container, color_fn):
         prefix = color_fn(container.name + " | ")
-        for line in split_buffer(self._attach(container), '\n'):
-            yield prefix + line
+        # Attach to container before log printer starts running
+        line_generator = split_buffer(self._attach(container), '\n')
+        return (prefix + line for line in line_generator)
 
     def _attach(self, container):
         params = {