diff --git a/src/components/calendar/Calendar.js b/src/components/calendar/Calendar.js
index 553be65195..dd23726cac 100644
--- a/src/components/calendar/Calendar.js
+++ b/src/components/calendar/Calendar.js
@@ -25,7 +25,7 @@ export class Calendar extends Component {
         inputId: null,
         inputStyle: null,
         inputClassName: null,
-        inputMode: 'text',
+        inputMode: null,
         required: false,
         readOnlyInput: false,
         keepInvalid: false,
@@ -3055,7 +3055,7 @@ export class Calendar extends Component {
             return (
                 <InputText ref={this.inputRef} id={this.props.inputId} name={this.props.name} type="text" className={this.props.inputClassName} style={this.props.inputStyle}
                     readOnly={this.props.readOnlyInput} disabled={this.props.disabled} required={this.props.required} autoComplete="off" placeholder={this.props.placeholder}
-                    onInput={this.onUserInput} onFocus={this.onInputFocus} onBlur={this.onInputBlur} onKeyDown={this.onInputKeyDown} aria-labelledby={this.props.ariaLabelledBy} inputMode={this.props.inputMode} />
+                    onInput={this.onUserInput} onFocus={this.onInputFocus} onBlur={this.onInputBlur} onKeyDown={this.onInputKeyDown} aria-labelledby={this.props.ariaLabelledBy} inputMode={this.props.inputMode || 'none'} />
             );
         }
 
diff --git a/src/showcase/calendar/CalendarDoc.js b/src/showcase/calendar/CalendarDoc.js
index 80c088b57d..ebe18db1fd 100644
--- a/src/showcase/calendar/CalendarDoc.js
+++ b/src/showcase/calendar/CalendarDoc.js
@@ -838,7 +838,7 @@ const monthNavigatorTemplate = (options) => {
                                     <tr>
                                         <td>inputMode</td>
                                         <td>string</td>
-                                        <td>text</td>
+                                        <td>null</td>
                                         <td>HTML inputmode attribute of input.</td>
                                     </tr>
                                     <tr>