diff --git a/hivemq-edge/src/main/java/com/hivemq/api/resources/impl/ProtocolAdaptersResourceImpl.java b/hivemq-edge/src/main/java/com/hivemq/api/resources/impl/ProtocolAdaptersResourceImpl.java
index b49243410..93d57a8f4 100644
--- a/hivemq-edge/src/main/java/com/hivemq/api/resources/impl/ProtocolAdaptersResourceImpl.java
+++ b/hivemq-edge/src/main/java/com/hivemq/api/resources/impl/ProtocolAdaptersResourceImpl.java
@@ -644,7 +644,15 @@ protected void validateAdapterSchema(
                     .map(DomainTag::toTagMap)
                     .collect(Collectors.toList());
 
-            final List<? extends Tag> tags = configConverter.mapsToTags(adapterType, domainTags);
+            final List<? extends Tag> tags;
+            try {
+                tags = configConverter.mapsToTags(adapterType, domainTags);
+            } catch (final IllegalArgumentException illegalArgumentException) {
+                log.warn("Unable to parse tags for adapter '{}'", adapterName);
+                log.debug("Original Exception: ", illegalArgumentException);
+                return ErrorResponseUtil.invalidInput(
+                        "Exception during parsing of tags for the adapter. See log for further information.");
+            }
 
             final List<NorthboundMapping> northboundMappings = adapter.getNorthboundMappingModels()
                     .stream()