diff --git a/java/debugger/impl/src/com/intellij/debugger/impl/RemoteConnectionBuilder.java b/java/debugger/impl/src/com/intellij/debugger/impl/RemoteConnectionBuilder.java
index a675e11766ae..944f22868c02 100644
--- a/java/debugger/impl/src/com/intellij/debugger/impl/RemoteConnectionBuilder.java
+++ b/java/debugger/impl/src/com/intellij/debugger/impl/RemoteConnectionBuilder.java
@@ -245,6 +245,9 @@ public class RemoteConnectionBuilder {
       if (Registry.is("debugger.async.stacks.coroutines", false)) {
         parametersList.addProperty("kotlinx.coroutines.debug.enable.creation.stack.trace", "false");
         parametersList.addProperty("debugger.agent.enable.coroutines", "true");
+        if (Registry.is("debugger.async.stacks.flows", false)) {
+          parametersList.addProperty("kotlinx.coroutines.debug.enable.flows.stack.trace", "true");
+        }
       }
     }
   }
diff --git a/platform/util/resources/misc/registry.properties b/platform/util/resources/misc/registry.properties
index 0b1e031cc6fa..da53471fe7dd 100644
--- a/platform/util/resources/misc/registry.properties
+++ b/platform/util/resources/misc/registry.properties
@@ -584,6 +584,8 @@ debugger.capture.points.annotations=false
 debugger.collection.watchpoints.enabled=false
 debugger.async.stacks.coroutines=true
 debugger.async.stacks.coroutines.description=Enable async stack traces for coroutines
+debugger.async.stacks.flows=false
+debugger.async.stacks.flows.description=Enable async stack traces for Kotlin flows (MutableSharedFlow and MutableStateFlow)
 debugger.async.stacks.max.depth=500
 debugger.async.stacks.max.depth.description=Maximum depth of captured async stacks
 debugger.log.async.stacks=false