diff --git a/internal/serviceapi/sshportal.go b/internal/serviceapi/sshportal.go
index 1aef0d6f..bfe0597d 100644
--- a/internal/serviceapi/sshportal.go
+++ b/internal/serviceapi/sshportal.go
@@ -24,6 +24,7 @@ type SSHAccessQuery struct {
 	NamespaceName  string
 	ProjectID      int
 	EnvironmentID  int
+	SessionID      string
 }
 
 var (
diff --git a/internal/sshserver/authhandler.go b/internal/sshserver/authhandler.go
index 3cb910a2..118a370a 100644
--- a/internal/sshserver/authhandler.go
+++ b/internal/sshserver/authhandler.go
@@ -59,6 +59,7 @@ func pubKeyAuth(log *zap.Logger, nc *nats.Conn,
 			NamespaceName:  ctx.User(),
 			ProjectID:      pid,
 			EnvironmentID:  eid,
+			SessionID:      ctx.SessionID(),
 		})
 		if err != nil {
 			log.Warn("couldn't marshal SSHAccessQuery",