diff --git a/lib/puppet/property.rb b/lib/puppet/property.rb
index 757fffa5ff..3df3c46847 100644
--- a/lib/puppet/property.rb
+++ b/lib/puppet/property.rb
@@ -526,7 +526,7 @@ def should
 
     devfail "should for #{self.class.name} on #{resource.name} is not an array" unless @should.is_a?(Array)
 
-    if match_all?
+    if match_all? and ! (@should.one? and @should.first.instance_of? Puppet::Pops::Evaluator::DeferredValue)
       @should.collect { |val| unmunge(val) }
     else
       unmunge(@should[0])