diff --git a/plugins/stream-debugger/src/main/java/com/intellij/debugger/streams/trace/dsl/impl/java/JavaStatementFactory.kt b/plugins/stream-debugger/src/main/java/com/intellij/debugger/streams/trace/dsl/impl/java/JavaStatementFactory.kt
index f53813c2f199..4fca92563adc 100644
--- a/plugins/stream-debugger/src/main/java/com/intellij/debugger/streams/trace/dsl/impl/java/JavaStatementFactory.kt
+++ b/plugins/stream-debugger/src/main/java/com/intellij/debugger/streams/trace/dsl/impl/java/JavaStatementFactory.kt
@@ -71,7 +71,7 @@ class JavaStatementFactory : StatementFactory {
     JavaAssignmentStatement(variable, expression)
 
   override fun createMapVariable(keyType: GenericType, valueType: GenericType, name: String, linked: Boolean): MapVariable =
-    JavaMapVariable(types.map(keyType, valueType), name)
+    JavaMapVariable(if (linked) types.linkedMap(keyType, valueType) else types.map(keyType, valueType), name)
 
   override fun createArrayVariable(elementType: GenericType, name: String): ArrayVariable =
     JavaArrayVariable(types.array(elementType), name)