diff --git a/spring-shell-core/src/main/resources/org/springframework/shell/component/string-input-default.stg b/spring-shell-core/src/main/resources/org/springframework/shell/component/string-input-default.stg
index b451fa9e..dfca30b0 100644
--- a/spring-shell-core/src/main/resources/org/springframework/shell/component/string-input-default.stg
+++ b/spring-shell-core/src/main/resources/org/springframework/shell/component/string-input-default.stg
@@ -4,13 +4,17 @@ info(model) ::= <%
   <if(model.maskedInput)>
     <model.maskedInput>
   <else>
-    <("[Default "); format="value"><model.defaultValue; format="value"><("]"); format="value">
+    <if(model.defaultValue)>
+      <("[Default "); format="value"><model.defaultValue; format="value"><("]"); format="value">
+    <endif>
   <endif>
 <else>
   <if(model.input)>
     <model.input>
   <else>
-    <("[Default "); format="value"><model.defaultValue; format="value"><("]"); format="value">
+    <if(model.defaultValue)>
+      <("[Default "); format="value"><model.defaultValue; format="value"><("]"); format="value">
+    <endif>
   <endif>
 <endif>
 %>