diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java
index 5e1022050..f33f3f90a 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java
@@ -21,6 +21,7 @@
 
 package org.apache.struts2.views.jsp.ui;
 
+import org.apache.commons.lang.ObjectUtils;
 import org.apache.struts2.components.UIBean;
 import org.apache.struts2.views.jsp.ComponentTagSupport;
 
@@ -291,19 +292,9 @@ public abstract class AbstractUITag extends ComponentTagSupport implements Dynam
 
     public void setDynamicAttribute(String uri, String localName, Object value) throws JspException {
         if (value != null && value instanceof String) {
-            evaluateValue(localName, value);
+            dynamicAttributes.put(localName, String.valueOf(ObjectUtils.defaultIfNull(findValue(value.toString()), value)));
         } else {
             dynamicAttributes.put(localName, value);
         }
     }
-
-    private void evaluateValue(String localName, Object value) {
-        Object evaluatedValue = findValue(value.toString());
-        if (evaluatedValue != null) {
-            dynamicAttributes.put(localName, evaluatedValue);
-        } else {
-            dynamicAttributes.put(localName, value);
-        }
-    }
-
 }