diff --git a/lib/reversetunnel/localsite.go b/lib/reversetunnel/localsite.go
index 02ae89c2daa83..5328e30cdd261 100644
--- a/lib/reversetunnel/localsite.go
+++ b/lib/reversetunnel/localsite.go
@@ -400,6 +400,10 @@ func (s *localSite) dialAndForward(params DialParams) (_ net.Conn, retErr error)
 		TargetServer:    params.TargetServer,
 		Clock:           s.clock,
 	}
+	// Ensure the hostname is set correctly if we have details of the target
+	if params.TargetServer != nil {
+		serverConfig.TargetHostname = params.TargetServer.GetHostname()
+	}
 	remoteServer, err := forward.New(serverConfig)
 	if err != nil {
 		return nil, trace.Wrap(err)
diff --git a/lib/reversetunnel/remotesite.go b/lib/reversetunnel/remotesite.go
index 4fc70312aaace..c952f12d72f7a 100644
--- a/lib/reversetunnel/remotesite.go
+++ b/lib/reversetunnel/remotesite.go
@@ -859,6 +859,10 @@ func (s *remoteSite) dialAndForward(params DialParams) (_ net.Conn, retErr error
 		TargetServer:    params.TargetServer,
 		Clock:           s.clock,
 	}
+	// Ensure the hostname is set correctly if we have details of the target
+	if params.TargetServer != nil {
+		serverConfig.TargetHostname = params.TargetServer.GetHostname()
+	}
 	remoteServer, err := forward.New(serverConfig)
 	if err != nil {
 		return nil, trace.Wrap(err)