diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/html/HtmlDocumentationWriter.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/html/HtmlDocumentationWriter.java
index 7def25c712..6fafb050b4 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/html/HtmlDocumentationWriter.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/html/HtmlDocumentationWriter.java
@@ -409,7 +409,9 @@ public class HtmlDocumentationWriter implements DocumentationWriter {
         }
         
         final DynamicProperty dynProp = configurableComponent.getClass().getAnnotation(DynamicProperty.class);
-        dynamicProperties.add(dynProp);
+        if (dynProp != null) {
+            dynamicProperties.add(dynProp);
+        }
         
         return dynamicProperties;
     }