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()
diff --git a/integration-cli/docker_cli_logs_test.go b/integration-cli/docker_cli_logs_test.go
index b32b7344b4..83d4597ce6 100644
--- a/integration-cli/docker_cli_logs_test.go
+++ b/integration-cli/docker_cli_logs_test.go
@@ -213,3 +213,35 @@ func TestLogsTail(t *testing.T) {
 	deleteContainer(cleanedContainerID)
 	logDone("logs - logs tail")
 }
+
+func TestLogsFollowStopped(t *testing.T) {
+	runCmd := exec.Command(dockerBinary, "run", "-d", "busybox", "echo", "hello")
+
+	out, _, _, err := runCommandWithStdoutStderr(runCmd)
+	errorOut(err, t, fmt.Sprintf("run failed with errors: %v", err))
+
+	cleanedContainerID := stripTrailingCharacters(out)
+	exec.Command(dockerBinary, "wait", cleanedContainerID).Run()
+
+	logsCmd := exec.Command(dockerBinary, "logs", "-f", cleanedContainerID)
+	if err := logsCmd.Start(); err != nil {
+		t.Fatal(err)
+	}
+
+	c := make(chan struct{})
+	go func() {
+		if err := logsCmd.Wait(); err != nil {
+			t.Fatal(err)
+		}
+		close(c)
+	}()
+
+	select {
+	case <-c:
+	case <-time.After(1 * time.Second):
+		t.Fatal("Following logs is hanged")
+	}
+
+	deleteContainer(cleanedContainerID)
+	logDone("logs - logs follow stopped container")
+}