diff --git a/src/main/java/com/eactive/apim/portal/portalproperty/service/PortalPropertyService.java b/src/main/java/com/eactive/apim/portal/portalproperty/service/PortalPropertyService.java
index b6cc942..7cb4cdb 100644
--- a/src/main/java/com/eactive/apim/portal/portalproperty/service/PortalPropertyService.java
+++ b/src/main/java/com/eactive/apim/portal/portalproperty/service/PortalPropertyService.java
@@ -30,6 +30,7 @@ public class PortalPropertyService extends AbstractDataService<PortalPropertyGro
             .orElse(new PortalPropertyGroup());
 
         return portalPropertyGroup.getPortalProperties().stream()
+            .filter(portalProperty -> portalProperty.getPropertyValue() != null)
             .collect(Collectors.toMap(
                 portalProperty -> portalProperty.getId().getPropertyName(),
                 PortalProperty::getPropertyValue,