diff --git a/src/components/Calendar/index.js b/src/components/Calendar/index.js
index 73b9faa48..c38ef7d64 100644
--- a/src/components/Calendar/index.js
+++ b/src/components/Calendar/index.js
@@ -131,7 +131,7 @@ class Calendar extends PureComponent {
       date: 'date',
     };
     const targetProp = propMapper[this.props.displayMode];
-    if (this.props[targetProp] !== prevProps[targetProp]) {
+    if (this.props[targetProp] !== prevProps[targetProp] && this.props.updateShownDateFlag) {
       this.updateShownDate(this.props);
     }
 
diff --git a/src/components/DateRange/index.js b/src/components/DateRange/index.js
index 3c963ecd2..d2ce33b51 100644
--- a/src/components/DateRange/index.js
+++ b/src/components/DateRange/index.js
@@ -140,6 +140,7 @@ class DateRange extends Component {
         ref={target => {
           this.calendar = target;
         }}
+        updateShownDateFlag={this.props.updateShownDateFlag}
       />
     );
   }
@@ -152,6 +153,7 @@ DateRange.defaultProps = {
   retainEndDateOnFirstSelection: false,
   rangeColors: ['#3d91ff', '#3ecf8e', '#fed14c'],
   disabledDates: [],
+  updateShownDateFlag: false
 };
 
 DateRange.propTypes = {
@@ -162,6 +164,7 @@ DateRange.propTypes = {
   ranges: PropTypes.arrayOf(rangeShape),
   moveRangeOnFirstSelection: PropTypes.bool,
   retainEndDateOnFirstSelection: PropTypes.bool,
+  updateShownDateFlag: PropTypes.bool
 };
 
 export default DateRange;