diff --git a/core/src/main/java/org/apache/struts2/components/Text.java b/core/src/main/java/org/apache/struts2/components/Text.java
index a5ea21715..8ce179ff4 100644
--- a/core/src/main/java/org/apache/struts2/components/Text.java
+++ b/core/src/main/java/org/apache/struts2/components/Text.java
@@ -123,6 +123,7 @@ public class Text extends ContextBean implements Param.UnnamedParametric {
     protected List<Object> values = Collections.emptyList();
     protected String actualName;
     protected String name;
+    @Deprecated
     protected String searchStack;
     private boolean escapeHtml = false;
     private boolean escapeJavaScript = false;
@@ -138,6 +139,7 @@ public class Text extends ContextBean implements Param.UnnamedParametric {
         this.name = name;
     }
 
+    @Deprecated
     @StrutsTagAttribute(description="Search the stack if property is not found on resources", type = "Boolean", defaultValue = "false")
     public void setSearchValueStack(String searchStack) {
         this.searchStack = searchStack;
diff --git a/core/src/main/java/org/apache/struts2/util/TextProviderHelper.java b/core/src/main/java/org/apache/struts2/util/TextProviderHelper.java
index 5200844c1..145f6c006 100644
--- a/core/src/main/java/org/apache/struts2/util/TextProviderHelper.java
+++ b/core/src/main/java/org/apache/struts2/util/TextProviderHelper.java
@@ -62,7 +62,10 @@ public class TextProviderHelper {
      * @param searchStack     search stack for the key
      *
      * @return the message if found, otherwise the defaultMessage
+     *
+     * @deprecated The stack should never be searched for the key. Use the version without the searchStack boolean instead.
      */
+    @Deprecated
     public static String getText(String key, String defaultMessage, List<Object> args, ValueStack stack, boolean searchStack) {
         String msg = null;
         TextProvider tp = null;
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/TextTag.java b/core/src/main/java/org/apache/struts2/views/jsp/TextTag.java
index c0420dfad..b47e8e0e4 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/TextTag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/TextTag.java
@@ -34,6 +34,7 @@ public class TextTag extends ContextBeanTag {
     private static final long serialVersionUID = -3075088084198264581L;
 
     protected String name;
+    @Deprecated
     protected String searchValueStack;
     private boolean escapeHtml = false;
     private boolean escapeJavaScript = false;
@@ -60,6 +61,7 @@ public class TextTag extends ContextBeanTag {
         this.name = name;
     }
 
+    @Deprecated
     public void setSearchValueStack(String searchStack) {
         this.searchValueStack = searchStack;
     }