diff --git a/backend/licenseinfo/src/main/java/org/eclipse/sw360/licenseinfo/outputGenerators/DocxGenerator.java b/backend/licenseinfo/src/main/java/org/eclipse/sw360/licenseinfo/outputGenerators/DocxGenerator.java
index 88783c4125..30593decc7 100644
--- a/backend/licenseinfo/src/main/java/org/eclipse/sw360/licenseinfo/outputGenerators/DocxGenerator.java
+++ b/backend/licenseinfo/src/main/java/org/eclipse/sw360/licenseinfo/outputGenerators/DocxGenerator.java
@@ -648,9 +648,9 @@ private void fillComponentObligationsTable(XWPFDocument document,
                                 .anyMatch(mlid -> mlid.equals(lid.replace("\n", "").replace("\r", "")))))
                 .forEach(o -> {
                     o.getLicenseIDs().stream().forEach(lid -> {
-                        Map<String, String> oblTopicText = new HashMap<String, String>();
-                        oblTopicText.put(o.getTopic(), o.getText());
-                        licenseIdToOblTopicText.put(lid, oblTopicText);
+                        licenseIdToOblTopicText
+                                .computeIfAbsent(lid, k -> new LinkedHashMap<>())
+                                .put(o.getTopic(), o.getText());
                     });
                 });