diff --git a/kyuubi-server/src/main/scala/org/apache/kyuubi/server/metadata/jdbc/JDBCMetadataStore.scala b/kyuubi-server/src/main/scala/org/apache/kyuubi/server/metadata/jdbc/JDBCMetadataStore.scala
index b7e83cd563d..c09438ad26e 100644
--- a/kyuubi-server/src/main/scala/org/apache/kyuubi/server/metadata/jdbc/JDBCMetadataStore.scala
+++ b/kyuubi-server/src/main/scala/org/apache/kyuubi/server/metadata/jdbc/JDBCMetadataStore.scala
@@ -376,9 +376,11 @@ class JDBCMetadataStore(conf: KyuubiConf) extends MetadataStore with Logging {
       setClauses += "engine_state = ?"
       params += metadata.engineState
     }
-    metadata.engineError.foreach { error =>
+    // Update engineError when it's defined or when engineId is defined
+    // This ensures pending reasons are cleared when app transitions to success
+    if (metadata.engineError.isDefined || Option(metadata.engineId).isDefined) {
       setClauses += "engine_error = ?"
-      params += error
+      params += metadata.engineError.orNull
     }
     if (metadata.peerInstanceClosed) {
       setClauses += "peer_instance_closed = ?"
diff --git a/kyuubi-server/src/test/scala/org/apache/kyuubi/server/metadata/jdbc/JDBCMetadataStoreSuite.scala b/kyuubi-server/src/test/scala/org/apache/kyuubi/server/metadata/jdbc/JDBCMetadataStoreSuite.scala
index 49f3b487289..55d5a9183c8 100644
--- a/kyuubi-server/src/test/scala/org/apache/kyuubi/server/metadata/jdbc/JDBCMetadataStoreSuite.scala
+++ b/kyuubi-server/src/test/scala/org/apache/kyuubi/server/metadata/jdbc/JDBCMetadataStoreSuite.scala
@@ -271,6 +271,68 @@ class JDBCMetadataStoreSuite extends KyuubiFunSuite {
     assert(jdbcMetadataStore.getLatestSchemaUrl(Seq(url1, url2, url3, url4, url5)).get === url5)
   }
 
+  test("update engineError conditionally based on engineError or engineId presence") {
+    val batchId = UUID.randomUUID().toString
+    val kyuubiInstance = "localhost:10099"
+    val batchMetadata = Metadata(
+      identifier = batchId,
+      sessionType = SessionType.BATCH,
+      realUser = "kyuubi",
+      username = "kyuubi",
+      ipAddress = "127.0.0.1",
+      kyuubiInstance = kyuubiInstance,
+      state = "PENDING",
+      resource = "intern",
+      className = "org.apache.kyuubi.SparkWC",
+      requestName = "kyuubi_batch",
+      requestConf = Map("spark.master" -> "local"),
+      requestArgs = Seq("100"),
+      createTime = System.currentTimeMillis(),
+      engineType = "spark",
+      clusterManager = Some("local"))
+
+    jdbcMetadataStore.insertMetadata(batchMetadata)
+
+    // Case 1: Update engineError when engineError is defined
+    val pendingMetadata = batchMetadata.copy(
+      state = "PENDING",
+      engineError = Some("Pod pending: Insufficient CPU"))
+    jdbcMetadataStore.updateMetadata(pendingMetadata)
+
+    var retrievedMetadata = jdbcMetadataStore.getMetadata(batchId)
+    assert(retrievedMetadata.engineError == Some("Pod pending: Insufficient CPU"))
+
+    // Case 2: When app transitions to running with engineId, engineError should be cleared
+    val runningMetadata = pendingMetadata.copy(
+      state = "RUNNING",
+      engineId = "app-123",
+      engineError = None)
+    jdbcMetadataStore.updateMetadata(runningMetadata)
+
+    retrievedMetadata = jdbcMetadataStore.getMetadata(batchId)
+    assert(retrievedMetadata.engineError == None)
+    assert(retrievedMetadata.engineId == "app-123")
+
+    // Case 3: Update without engineError and without engineId should not update engineError
+    // First set an error again
+    val errorMetadata = runningMetadata.copy(engineError = Some("New error"))
+    jdbcMetadataStore.updateMetadata(errorMetadata)
+    retrievedMetadata = jdbcMetadataStore.getMetadata(batchId)
+    assert(retrievedMetadata.engineError == Some("New error"))
+
+    // Now update state without engineError and without engineId - error should remain
+    val stateOnlyUpdate = Metadata(
+      identifier = batchId,
+      state = "FINISHED")
+    jdbcMetadataStore.updateMetadata(stateOnlyUpdate)
+
+    retrievedMetadata = jdbcMetadataStore.getMetadata(batchId)
+    assert(retrievedMetadata.engineError == Some("New error")) // Should remain unchanged
+
+    // Clean up
+    jdbcMetadataStore.cleanupMetadataByIdentifier(batchId)
+  }
+
   test("kubernetes engine info") {
     val tag = UUID.randomUUID().toString
     val metadata = KubernetesEngineInfo(