diff --git a/command/agent/command.go b/command/agent/command.go
index 6e6d6a7bb..65af1f85d 100644
--- a/command/agent/command.go
+++ b/command/agent/command.go
@@ -548,13 +548,14 @@ WAIT:
 	case <-c.retryJoinErrCh:
 		return 1
 	}
-	c.Ui.Output(fmt.Sprintf("Caught signal: %v", sig))
 
-	// Skip any SIGPIPE signal (See issue #1798)
+	// Skip any SIGPIPE signal and don't try to log it (See issues #1798, #3554)
 	if sig == syscall.SIGPIPE {
 		goto WAIT
 	}
 
+	c.Ui.Output(fmt.Sprintf("Caught signal: %v", sig))
+
 	// Check if this is a SIGHUP
 	if sig == syscall.SIGHUP {
 		c.handleReload()