diff --git a/persistence-service-v1/persistence-service-external-api-impl-v2/src/main/java/com/iqser/red/persistence/service/v2/external/api/impl/controller/ComponentControllerV2.java b/persistence-service-v1/persistence-service-external-api-impl-v2/src/main/java/com/iqser/red/persistence/service/v2/external/api/impl/controller/ComponentControllerV2.java
index 03a5af6c9..514490865 100644
--- a/persistence-service-v1/persistence-service-external-api-impl-v2/src/main/java/com/iqser/red/persistence/service/v2/external/api/impl/controller/ComponentControllerV2.java
+++ b/persistence-service-v1/persistence-service-external-api-impl-v2/src/main/java/com/iqser/red/persistence/service/v2/external/api/impl/controller/ComponentControllerV2.java
@@ -66,7 +66,7 @@ public class ComponentControllerV2 implements ComponentResource {
         }
 
         Map<String, List<com.iqser.red.service.persistence.service.v2.api.external.model.Component>> componentsDetails = new HashMap<>();
-        if (includeDetails) {
+        if (includeDetails && overrides.getComponentOverrides() != null) {
             componentLog.getComponents().forEach(c -> {
                 componentsDetails.computeIfAbsent(c.getName(), (x) -> new ArrayList<>())
                         .addAll(c.getComponentValues().stream().map(entry -> convert(entry, overrides, c.getName())).toList());