1 files changed, 4 insertions, 2 deletions
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaExportHandler.java b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaExportHandler.java
index 5cafec2bda..0813650b3a 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaExportHandler.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaExportHandler.java
@@ -559,8 +559,10 @@ public class ToscaExportHandler {
             // merge component properties and inputs properties
             mergedProperties.putAll(convertedProperties);
         }
-        if (MapUtils.isNotEmpty(mergedProperties) && Objects.nonNull(inputDef)) {
-            resolveDefaultPropertyValue(inputDef, mergedProperties, dataTypes);
+        if (MapUtils.isNotEmpty(mergedProperties)) {
+            if (Objects.nonNull(inputDef)) {
+                resolveDefaultPropertyValue(inputDef, mergedProperties, dataTypes);
+            }
             toscaNodeType.setProperties(mergedProperties);
         }