diff --git a/pkg/bindings/containers/attach.go b/pkg/bindings/containers/attach.go
index d54f386c57..ca3974a3ce 100644
--- a/pkg/bindings/containers/attach.go
+++ b/pkg/bindings/containers/attach.go
@@ -219,7 +219,7 @@ func Attach(ctx context.Context, nameOrID string, stdin io.Reader, stdout io.Wri
 			// Read multiplexed channels and write to appropriate stream
 			fd, l, err := DemuxHeader(socket, buffer)
 			if err != nil {
-				if errors.Is(err, io.EOF) || errors.Is(err, io.ErrUnexpectedEOF) {
+				if errors.Is(err, io.EOF) {
 					return nil
 				}
 				return err
@@ -540,7 +540,7 @@ func ExecStartAndAttach(ctx context.Context, sessionID string, options *ExecStar
 			// Read multiplexed channels and write to appropriate stream
 			fd, l, err := DemuxHeader(socket, buffer)
 			if err != nil {
-				if errors.Is(err, io.EOF) || errors.Is(err, io.ErrUnexpectedEOF) {
+				if errors.Is(err, io.EOF) {
 					return nil
 				}
 				return err
diff --git a/pkg/bindings/containers/logs.go b/pkg/bindings/containers/logs.go
index cf953dd72e..8796c3a768 100644
--- a/pkg/bindings/containers/logs.go
+++ b/pkg/bindings/containers/logs.go
@@ -44,7 +44,7 @@ func Logs(ctx context.Context, nameOrID string, options *LogOptions, stdoutChan,
 	for {
 		fd, l, err := DemuxHeader(response.Body, buffer)
 		if err != nil {
-			if errors.Is(err, io.EOF) || errors.Is(err, io.ErrUnexpectedEOF) {
+			if errors.Is(err, io.EOF) {
 				return nil
 			}
 			return err
diff --git a/pkg/bindings/test/containers_test.go b/pkg/bindings/test/containers_test.go
index 64b421eec2..9de2f518d4 100644
--- a/pkg/bindings/test/containers_test.go
+++ b/pkg/bindings/test/containers_test.go
@@ -383,6 +383,11 @@ var _ = Describe("Podman containers ", func() {
 		o = strings.TrimSpace(o)
 		_, err = time.Parse(time.RFC1123Z, o)
 		Expect(err).ShouldNot(HaveOccurred())
+
+		// drain the line channel and make sure there are no more log lines
+		for l := range stdoutChan {
+			Fail("container logs returned more than one line: " + l)
+		}
 	})
 
 	It("podman top", func() {