diff --git a/nifi-mock/src/main/java/org/apache/nifi/util/MockPropertyValue.java b/nifi-mock/src/main/java/org/apache/nifi/util/MockPropertyValue.java
index 5f09e82492..a5df1a94f2 100644
--- a/nifi-mock/src/main/java/org/apache/nifi/util/MockPropertyValue.java
+++ b/nifi-mock/src/main/java/org/apache/nifi/util/MockPropertyValue.java
@@ -16,7 +16,6 @@
  */
 package org.apache.nifi.util;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
@@ -210,7 +209,7 @@ public class MockPropertyValue implements PropertyValue {
          * raises an error which makes it not mimick real world behavior.
          */
         if (flowFile == null) {
-            return evaluateAttributeExpressions(new HashMap<>());
+            return evaluateAttributeExpressions(null, (Map<String,String>)null);
         }
         return evaluateAttributeExpressions(flowFile, null, null);
     }