diff --git a/daemon/logs.go b/daemon/logs.go
index 386d9c69c3..c9c2ab89ba 100644
--- a/daemon/logs.go
+++ b/daemon/logs.go
@@ -111,7 +111,7 @@ func (daemon *Daemon) ContainerLogs(job *engine.Job) engine.Status {
 			}
 		}
 	}
-	if follow {
+	if follow && container.State.IsRunning() {
 		errors := make(chan error, 2)
 		if stdout {
 			stdoutPipe := container.StdoutLogPipe()