diff --git a/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/src/main/java/org/apache/nifi/processors/attributes/UpdateAttribute.java b/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/src/main/java/org/apache/nifi/processors/attributes/UpdateAttribute.java
index 22e558bd25..86f523ac82 100644
--- a/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/src/main/java/org/apache/nifi/processors/attributes/UpdateAttribute.java
+++ b/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/src/main/java/org/apache/nifi/processors/attributes/UpdateAttribute.java
@@ -393,6 +393,9 @@ public class UpdateAttribute extends AbstractProcessor implements Searchable {
         final Criteria criteria = criteriaCache.get();
 
         FlowFile flowFile = session.get();
+        if (flowFile == null) {
+            return;
+        }
 
         final Map<PropertyDescriptor, String> properties = context.getProperties();