diff --git a/pkg/server/api/mcp/v1/v1_handler.go b/pkg/server/api/mcp/v1/v1_handler.go
index 4e0932107..811215b8a 100644
--- a/pkg/server/api/mcp/v1/v1_handler.go
+++ b/pkg/server/api/mcp/v1/v1_handler.go
@@ -3,7 +3,6 @@ package mcp_v1
 import (
 	"context"
 	"net/http"
-	"time"
 
 	"github.com/go-chi/chi/v5"
 	"github.com/modelcontextprotocol/go-sdk/mcp"
@@ -50,10 +49,10 @@ func NewMux(logger *log.Logger, proboSvc *probo.Service, authSvc *auth.Service,
 	handler := mcp.NewStreamableHTTPHandler(
 		getServer,
 		&mcp.StreamableHTTPOptions{
-			Stateless:      false,
-			SessionTimeout: 30 * time.Minute,
-			EventStore:     eventStore,
-			Logger:         nil, // TODO put logger here
+			Stateless: true,
+			// SessionTimeout: 30 * time.Minute,
+			EventStore: eventStore,
+			Logger:     nil, // TODO put logger here
 		},
 	)