diff --git a/connector/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectAnalyzeHandler.scala b/connector/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectAnalyzeHandler.scala
index 90981f5b7ba02..f6adcd852e810 100644
--- a/connector/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectAnalyzeHandler.scala
+++ b/connector/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectAnalyzeHandler.scala
@@ -37,10 +37,11 @@ private[connect] class SparkConnectAnalyzeHandler(
       SparkConnectService
         .getOrCreateIsolatedSession(request.getUserContext.getUserId, request.getClientId)
         .session
-
-    val response = process(request, session)
-    responseObserver.onNext(response)
-    responseObserver.onCompleted()
+    session.withActive {
+      val response = process(request, session)
+      responseObserver.onNext(response)
+      responseObserver.onCompleted()
+    }
   }
 
   def process(