diff --git a/server-spi/src/main/java/org/keycloak/models/utils/StripSecretsUtils.java b/server-spi/src/main/java/org/keycloak/models/utils/StripSecretsUtils.java
index 06989a525f..26f5adc5a9 100644
--- a/server-spi/src/main/java/org/keycloak/models/utils/StripSecretsUtils.java
+++ b/server-spi/src/main/java/org/keycloak/models/utils/StripSecretsUtils.java
@@ -37,6 +37,10 @@ public class StripSecretsUtils {
 
     public static ComponentRepresentation strip(KeycloakSession session, ComponentRepresentation rep) {
         Map<String, ProviderConfigProperty> configProperties = ComponentUtil.getComponentConfigProperties(session, rep);
+        if (rep.getConfig() == null) {
+            return rep;
+        }
+
         Iterator<Map.Entry<String, List<String>>> itr = rep.getConfig().entrySet().iterator();
         while (itr.hasNext()) {
             Map.Entry<String, List<String>> next = itr.next();