diff --git a/build/tasks/src/org/jetbrains/intellij/build/logging/TeamCityBuildMessageLogger.kt b/build/tasks/src/org/jetbrains/intellij/build/logging/TeamCityBuildMessageLogger.kt
index 713120dc6a62..800694c2a585 100644
--- a/build/tasks/src/org/jetbrains/intellij/build/logging/TeamCityBuildMessageLogger.kt
+++ b/build/tasks/src/org/jetbrains/intellij/build/logging/TeamCityBuildMessageLogger.kt
@@ -30,16 +30,15 @@ class TeamCityBuildMessageLogger : BuildMessageLogger() {
      * [ServiceMessage.setFlowId] is called with [io.opentelemetry.api.trace.SpanContext.getSpanId].
      *
      * See [the docs](https://www.jetbrains.com/help/teamcity/service-messages.html#Message+FlowId).
+     *
+     * FIXME [ServiceMessage.setFlowId] is skipped as a workaround for TW-89630
      */
+    @Suppress("unused")
     @ApiStatus.Internal
     class SpanAwareServiceMessage : ServiceMessage {
-      constructor(span: Span, messageName: String, argument: String) : super(messageName, argument) {
-        setFlowId(span.spanContext.spanId)
-      }
+      constructor(span: Span, messageName: String, argument: String) : super(messageName, argument)
 
-      constructor(span: Span, messageName: String, attributes: Map<String, String>) : super(messageName, attributes) {
-        setFlowId(span.spanContext.spanId)
-      }
+      constructor(span: Span, messageName: String, attributes: Map<String, String>) : super(messageName, attributes)
     }
 
     /**
diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/logging/jps/JpsLoggerFactory.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/logging/jps/JpsLoggerFactory.kt
index c68b220f7220..1bbc13e62a68 100644
--- a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/logging/jps/JpsLoggerFactory.kt
+++ b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/logging/jps/JpsLoggerFactory.kt
@@ -13,7 +13,6 @@ import org.jetbrains.annotations.ApiStatus.Internal
 import org.jetbrains.annotations.Nls
 import org.jetbrains.annotations.VisibleForTesting
 import org.jetbrains.intellij.build.CompilationContext
-import org.jetbrains.intellij.build.logging.TeamCityBuildMessageLogger
 import org.jetbrains.jps.builders.BuildTarget
 import org.jetbrains.jps.incremental.MessageHandler
 import org.jetbrains.jps.incremental.messages.*
@@ -87,7 +86,7 @@ internal class JpsMessageHandler(private val context: CompilationContext, privat
   private val compilationFinishTimeForTarget = ConcurrentHashMap<String, Long>()
   private var progress = -1.0f
 
-  override fun processMessage(message: BuildMessage): Unit = TeamCityBuildMessageLogger.withFlow(span) {
+  override fun processMessage(message: BuildMessage) {
     val text = message.messageText
     when (message.kind) {
       BuildMessage.Kind.ERROR, BuildMessage.Kind.INTERNAL_BUILDER_ERROR -> {