diff --git a/contrib/cmd/recvtty/recvtty.go b/contrib/cmd/recvtty/recvtty.go
index cf2fddf76..8fddd0269 100644
--- a/contrib/cmd/recvtty/recvtty.go
+++ b/contrib/cmd/recvtty/recvtty.go
@@ -106,9 +106,6 @@ func handleSingle(path string, noStdin bool) error {
 	if err != nil {
 		return err
 	}
-	if err := console.ClearONLCR(c.Fd()); err != nil {
-		return err
-	}
 
 	// Copy from our stdio to the master fd.
 	var (
diff --git a/libcontainer/init_linux.go b/libcontainer/init_linux.go
index bb8ff0b52..06684eb5b 100644
--- a/libcontainer/init_linux.go
+++ b/libcontainer/init_linux.go
@@ -186,6 +186,10 @@ func setupConsole(socket *os.File, config *initConfig, mount bool) error {
 	if err != nil {
 		return err
 	}
+	err = console.ClearONLCR(pty.Fd())
+	if err != nil {
+		return err
+	}
 
 	// After we return from here, we don't need the console anymore.
 	defer pty.Close()
diff --git a/libcontainer/integration/execin_test.go b/libcontainer/integration/execin_test.go
index ad2066ea9..ca0ba63f4 100644
--- a/libcontainer/integration/execin_test.go
+++ b/libcontainer/integration/execin_test.go
@@ -313,7 +313,6 @@ func TestExecInTTY(t *testing.T) {
 			}
 			return
 		}
-		console.ClearONLCR(c.Fd())
 		dc <- &cdata{
 			c: c,
 		}
diff --git a/tty.go b/tty.go
index 844d7f842..b15010202 100644
--- a/tty.go
+++ b/tty.go
@@ -112,10 +112,6 @@ func (t *tty) recvtty(process *libcontainer.Process, socket *os.File) (Err error
 	if err != nil {
 		return err
 	}
-	err = console.ClearONLCR(cons.Fd())
-	if err != nil {
-		return err
-	}
 	epoller, err := console.NewEpoller()
 	if err != nil {
 		return err