diff --git a/li.strolch.agent/src/main/java/li/strolch/runtime/query/enums/DefaultEnumHandler.java b/li.strolch.agent/src/main/java/li/strolch/runtime/query/enums/DefaultEnumHandler.java
index b3113ceab..5f1729855 100644
--- a/li.strolch.agent/src/main/java/li/strolch/runtime/query/enums/DefaultEnumHandler.java
+++ b/li.strolch.agent/src/main/java/li/strolch/runtime/query/enums/DefaultEnumHandler.java
@@ -54,7 +54,7 @@ public class DefaultEnumHandler extends StrolchComponent implements EnumHandler
 
 			List<Parameter<?>> parameters = enumValuesByLanguage.getParameters();
 			parameters.sort(Comparator.comparing(Parameter::getIndex));
-			Map<String, String> values = new HashMap<>(parameters.size());
+			Map<String, String> values = new LinkedHashMap<>(parameters.size());
 			for (Parameter<?> param : parameters) {
 				StringParameter enumParam = (StringParameter) param;
 				values.put(enumParam.getId(), enumParam.getValue());