diff --git a/commands.go b/commands.go
index f2377d8da8..699be1e4cf 100644
--- a/commands.go
+++ b/commands.go
@@ -1530,7 +1530,7 @@ func (cli *DockerCli) CmdLogs(args ...string) error {
 	v.Set("logs", "1")
 	v.Set("stdout", "1")
 	v.Set("stderr", "1")
-	if *stream {
+	if *stream && container.State.Running {
 		v.Set("stream", "1")
 	}