2 files changed, 13 insertions, 2 deletions

diff --git a/vid-app-common/src/main/java/org/onap/vid/asdc/beans/Service.java b/vid-app-common/src/main/java/org/onap/vid/asdc/beans/Service.java
index 092cfe4e2..f5dd5d85f 100644
--- a/vid-app-common/src/main/java/org/onap/vid/asdc/beans/Service.java
+++ b/vid-app-common/src/main/java/org/onap/vid/asdc/beans/Service.java
@@ -20,6 +20,9 @@
 
 package org.onap.vid.asdc.beans;
 
+import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
 import java.util.Collection;
 import java.util.UUID;
 
@@ -77,6 +80,7 @@ public class Service {
 
     private String orchestrationType;
 
+    @JsonInclude(NON_NULL)
     private Boolean isInstantiationTemplateExists;
     
     
diff --git a/vid-app-common/src/main/java/org/onap/vid/services/InstantiationTemplatesService.java b/vid-app-common/src/main/java/org/onap/vid/services/InstantiationTemplatesService.java
index c033fbd59..17520eef4 100644
--- a/vid-app-common/src/main/java/org/onap/vid/services/InstantiationTemplatesService.java
+++ b/vid-app-common/src/main/java/org/onap/vid/services/InstantiationTemplatesService.java
@@ -29,6 +29,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 import javax.inject.Inject;
+import org.jetbrains.annotations.NotNull;
 import org.onap.vid.asdc.beans.Service;
 import org.onap.vid.dal.AsyncInstantiationRepository;
 import org.onap.vid.model.ModelUtil;
@@ -76,7 +77,8 @@ public class InstantiationTemplatesService {
 
     public Collection<Service> setOnEachServiceIsTemplateExists(Collection<Service> services){
         if (!featureManager.isActive(Features.FLAG_2004_CREATE_ANOTHER_INSTANCE_FROM_TEMPLATE)){
-            return services;
+            return unsetTemplateExistsToAllServices(services);
+
         }
 
         Set<String> serviceModelIdsFromDB  = asyncInstantiationRepository.getAllTemplatesServiceModelIds();
@@ -84,8 +86,13 @@ public class InstantiationTemplatesService {
         return services.stream().map(it -> setTemplateExistForService(it, serviceModelIdsFromDB)).collect(toList());
     }
 
-    protected Service setTemplateExistForService(Service service, Set<String> serviceModelIdsFromDb) {
+    @NotNull
+    protected Collection<Service> unsetTemplateExistsToAllServices(Collection<Service> services) {
+        services.forEach(it -> it.setIsInstantiationTemplateExists(false));
+        return services;
+    }
 
+    protected Service setTemplateExistForService(Service service, Set<String> serviceModelIdsFromDb) {
         service.setIsInstantiationTemplateExists(serviceModelIdsFromDb.contains(service.getUuid()));
         return service;
     }