diff --git a/core/src/main/java/org/apache/struts2/components/ElseIf.java b/core/src/main/java/org/apache/struts2/components/ElseIf.java
index 2ad93f0ba..c43d896f2 100644
--- a/core/src/main/java/org/apache/struts2/components/ElseIf.java
+++ b/core/src/main/java/org/apache/struts2/components/ElseIf.java
@@ -85,7 +85,12 @@ public class ElseIf extends Component {
     }
 
     public boolean end(Writer writer, String body) {
-
+        if (answer == null) {
+            answer = Boolean.FALSE;
+        }
+        if (answer.booleanValue()) {
+            stack.getContext().put(If.ANSWER, answer);
+        }
         return super.end(writer, "");
     }