diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardParameterContextDAO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardParameterContextDAO.java
index d4a69ac772..ea7efb68ec 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardParameterContextDAO.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardParameterContextDAO.java
@@ -232,9 +232,11 @@ public class StandardParameterContextDAO implements ParameterContextDAO {
         resolveInheritedParameterContexts(parameterContextDto);
 
         final List<ParameterContext> inheritedParameterContexts = new ArrayList<>();
-        inheritedParameterContexts.addAll(parameterContextDto.getInheritedParameterContexts().stream()
-                .map(entity -> flowManager.getParameterContextManager().getParameterContext(entity.getComponent().getId()))
-                .collect(Collectors.toList()));
+        if (parameterContextDto.getInheritedParameterContexts() != null) {
+            inheritedParameterContexts.addAll(parameterContextDto.getInheritedParameterContexts().stream()
+                    .map(entity -> flowManager.getParameterContextManager().getParameterContext(entity.getComponent().getId()))
+                    .collect(Collectors.toList()));
+        }
 
         return inheritedParameterContexts;
     }