diff --git a/src/common/common-util/src/main/java/ee/ria/xroad/common/conf/globalconf/SharedParametersV2Converter.java b/src/common/common-util/src/main/java/ee/ria/xroad/common/conf/globalconf/SharedParametersV2Converter.java
index ea6eb2f736..d9ba00d454 100644
--- a/src/common/common-util/src/main/java/ee/ria/xroad/common/conf/globalconf/SharedParametersV2Converter.java
+++ b/src/common/common-util/src/main/java/ee/ria/xroad/common/conf/globalconf/SharedParametersV2Converter.java
@@ -220,7 +220,7 @@ private SharedParameters.GlobalGroup toGlobalGroup(GlobalGroupType source) {
         target.setDescription(source.getDescription());
 
         if (source.getGroupMember() != null) {
-            target.setGroupMembers(source.getGroupMember().stream().map(clientConf -> (ClientId) clientConf).toList());
+            target.setGroupMembers(source.getGroupMember().stream().map(ClientId.class::cast).toList());
         }
         return target;
     }
diff --git a/src/common/common-util/src/main/java/ee/ria/xroad/common/conf/globalconf/SharedParametersV3Converter.java b/src/common/common-util/src/main/java/ee/ria/xroad/common/conf/globalconf/SharedParametersV3Converter.java
index 455b2a71e3..f61a45adf7 100644
--- a/src/common/common-util/src/main/java/ee/ria/xroad/common/conf/globalconf/SharedParametersV3Converter.java
+++ b/src/common/common-util/src/main/java/ee/ria/xroad/common/conf/globalconf/SharedParametersV3Converter.java
@@ -252,7 +252,7 @@ private SharedParameters.GlobalGroup toGlobalGroup(GlobalGroupType source) {
         target.setDescription(source.getDescription());
 
         if (source.getGroupMember() != null) {
-            target.setGroupMembers(source.getGroupMember().stream().map(clientConf -> (ClientId) clientConf).toList());
+            target.setGroupMembers(source.getGroupMember().stream().map(ClientId.class::cast).toList());
         }
         return target;
     }