diff --git a/model/src/main/java/org/openremote/model/custom/TeltonikaModelConfigurationAsset.java b/model/src/main/java/org/openremote/model/custom/TeltonikaModelConfigurationAsset.java
index 21bb401..551f9e8 100644
--- a/model/src/main/java/org/openremote/model/custom/TeltonikaModelConfigurationAsset.java
+++ b/model/src/main/java/org/openremote/model/custom/TeltonikaModelConfigurationAsset.java
@@ -13,6 +13,7 @@
 import org.openremote.model.value.ValueType;
 
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -66,7 +67,7 @@ public CustomValueTypes.TeltonikaParameterMap getParameterMap() {
         Optional<Attribute<CustomValueTypes.TeltonikaParameterMap>> map = getAttributes().get(PARAMETER_MAP);
 
         return map.flatMap(Attribute::getValue)
-                .orElse(null); // or provide a default value other than null, if appropriate
+                .orElse(new CustomValueTypes.TeltonikaParameterMap()); // or provide a default value other than null, if appropriate
     }
 
 }