diff --git a/components/supervisor/pkg/supervisor/supervisor.go b/components/supervisor/pkg/supervisor/supervisor.go
index 39b942bc0a3257..07bec4672665af 100644
--- a/components/supervisor/pkg/supervisor/supervisor.go
+++ b/components/supervisor/pkg/supervisor/supervisor.go
@@ -1295,6 +1295,8 @@ func startAPIEndpoint(ctx context.Context, cfg *Config, wg *sync.WaitGroup, serv
 			return
 		}
 
+		log.Infof("tunnel ssh: Connected from %s", conn.RemoteAddr())
+
 		conn2, err := net.Dial("tcp", net.JoinHostPort("localhost", strconv.FormatInt(int64(cfg.SSHPort), 10)))
 		if err != nil {
 			log.WithError(err).Error("tunnel ssh: dial to ssh server failed")
@@ -1302,7 +1304,10 @@ func startAPIEndpoint(ctx context.Context, cfg *Config, wg *sync.WaitGroup, serv
 		}
 
 		go io.Copy(conn, conn2)
-		_, _ = io.Copy(conn2, conn)
+		_, err = io.Copy(conn2, conn)
+		if err != nil {
+			log.WithError(err).Error("tunnel ssh: error returned from io.copy")
+		}
 
 		conn.Close()
 		conn2.Close()