diff --git a/.changelog/26582.txt b/.changelog/26582.txt
new file mode 100644
index 000000000..a365c0fb1
--- /dev/null
+++ b/.changelog/26582.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+logs: skip logging SIGPIPE
+```
diff --git a/command/agent/command.go b/command/agent/command.go
index c1f971750..51c29823a 100644
--- a/command/agent/command.go
+++ b/command/agent/command.go
@@ -1062,12 +1062,14 @@ func (c *Command) handleSignals() int {
 	for {
 		select {
 		case sig := <-signalCh:
+			// Skip any SIGPIPE signal (see issues #1798, #3554)
+			if sig == syscall.SIGPIPE {
+				continue
+			}
+
 			c.Ui.Output(fmt.Sprintf("Caught signal: %v", sig))
 
 			switch sig {
-			case syscall.SIGPIPE:
-				// Skip any SIGPIPE signal (see issues #1798, #3554)
-				continue
 			case syscall.SIGHUP:
 				sdNotifyReloading(sdSock)
 				err := c.handleReload()