diff --git a/kyuubi-common/src/main/scala/org/apache/kyuubi/session/AbstractSession.scala b/kyuubi-common/src/main/scala/org/apache/kyuubi/session/AbstractSession.scala
index e2281821d..700316d35 100644
--- a/kyuubi-common/src/main/scala/org/apache/kyuubi/session/AbstractSession.scala
+++ b/kyuubi-common/src/main/scala/org/apache/kyuubi/session/AbstractSession.scala
@@ -178,8 +178,8 @@ abstract class AbstractSession(
   }
 
   override def closeOperation(operationHandle: OperationHandle): Unit = withAcquireRelease() {
-    sessionManager.operationManager.closeOperation(operationHandle)
     opHandleSet.remove(operationHandle)
+    sessionManager.operationManager.closeOperation(operationHandle)
   }
 
   override def getResultSetMetadata(